File jdk10-gcc.patch of Package java-10-openjdk
--- jdk10/src/hotspot/os/linux/os_linux.cpp 2018-06-24 16:07:06.000000000 +0200
+++ jdk10/src/hotspot/os/linux/os_linux.cpp 2021-06-04 08:48:21.170794019 +0200
@@ -2136,37 +2136,29 @@
}
void os::Linux::print_container_info(outputStream* st) {
- if (OSContainer::is_containerized()) {
+ if (!OSContainer::is_containerized()) {
+ return;
+ }
+
st->print("container (cgroup) information:\n");
- char *p = OSContainer::container_type();
- if (p == NULL)
- st->print("container_type() failed\n");
- else {
- st->print("container_type: %s\n", p);
- }
+ const char *p_ct = OSContainer::container_type();
+ st->print("container_type: %s\n", p_ct != NULL ? p_ct : "failed");
- p = OSContainer::cpu_cpuset_cpus();
- if (p == NULL)
- st->print("cpu_cpuset_cpus() failed\n");
- else {
- st->print("cpu_cpuset_cpus: %s\n", p);
+ char *p = OSContainer::cpu_cpuset_cpus();
+ st->print("cpu_cpuset_cpus: %s\n", p != NULL ? p : "failed");
free(p);
- }
p = OSContainer::cpu_cpuset_memory_nodes();
- if (p < 0)
- st->print("cpu_memory_nodes() failed\n");
- else {
- st->print("cpu_memory_nodes: %s\n", p);
+ st->print("cpu_memory_nodes: %s\n", p != NULL ? p : "failed");
free(p);
- }
int i = OSContainer::active_processor_count();
- if (i < 0)
- st->print("active_processor_count() failed\n");
- else
+ if (i > 0) {
st->print("active_processor_count: %d\n", i);
+ } else {
+ st->print("active_processor_count: failed\n");
+ }
i = OSContainer::cpu_quota();
st->print("cpu_quota: %d\n", i);
@@ -2193,7 +2185,6 @@
st->print("memory_max_usage_in_bytes: " JLONG_FORMAT "\n", j);
st->cr();
}
-}
void os::print_memory_info(outputStream* st) {