archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8218063: JDK-8218060 breaks build for S390

Browse source 
Reinstated function removed by JDK-8218060 and properly ifdef'ed it.

Reviewed-by: shade, eosterlund
This commit is contained in:
Thomas Schatzl 2019-01-30 17:02:17 +01:00
parent 8c9cc0b205
commit 3f0ac3a75c
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/hotspot/os/linux/os_linux.cpp
View file

@ -1856,6 +1856,36 @@ static bool _print_ascii_file(const char* filename, outputStream* st, const char
return true; return true;
} }
#if defined(S390)
// keywords_to_match - NULL terminated array of keywords
static bool print_matching_lines_from_sysinfo_file(outputStream* st, const char* keywords_to_match[]) {
const char* filename = "/proc/sysinfo";
char* line = NULL;
size_t length = 0;
FILE* fp = fopen(filename, "r");
if (fp == NULL) {
return false;
}
st->print_cr("Virtualization information:");
while (getline(&line, &length, fp) != -1) {
int i = 0;
while (keywords_to_match[i] != NULL) {
if (strncmp(line, keywords_to_match[i], strlen(keywords_to_match[i])) == 0) {
st->print("%s", line);
break;
}
i++;
}
}
free(line);
fclose(fp);
return true;
}
#endif
void os::print_dll_info(outputStream *st) { void os::print_dll_info(outputStream *st) {
st->print_cr("Dynamic libraries:"); st->print_cr("Dynamic libraries:");