wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openjdk10-bootstrap: fix too small maximum heap

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2025-04-11 12:42:13 +07:00
parent bb12640277
commit 5db40b63ad
7 changed files with 56 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/openjdk10-bootstrap/patches/aarch64.patch
View file

@ -1,6 +1,6 @@
--- jdk10u-jdk-10.0.2+13/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp.orig --- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ jdk10u-jdk-10.0.2+13/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -39,8 +39,6 @@ @@ -39,8 +39,6 @@ class InterpreterMacroAssembler: public
protected: protected:
protected: protected:

14
srcpkgs/openjdk10-bootstrap/patches/fix-compiler-version-10+.patch
View file

@ -1,6 +1,6 @@
--- a/make/autoconf/generated-configure.sh 2018-06-24 16:07:06.000000000 +0200 --- a/make/autoconf/generated-configure.sh
+++ b/make/autoconf/generated-configure.sh 2020-08-18 23:58:41.459262000 +0200 +++ b/make/autoconf/generated-configure.sh
@@ -34373,7 +34373,7 @@ @@ -34373,7 +34373,7 @@ $as_echo "$as_me: The result from runnin
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *[Uu]sage:.*//'` $SED -e 's/ *[Uu]sage:.*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
@ -9,7 +9,7 @@
elif test "x$TOOLCHAIN_TYPE" = xxlc; then elif test "x$TOOLCHAIN_TYPE" = xxlc; then
# xlc -qversion output typically looks like # xlc -qversion output typically looks like
# IBM XL C/C++ for AIX, V11.1 (5724-X13) # IBM XL C/C++ for AIX, V11.1 (5724-X13)
@@ -34434,7 +34434,7 @@ @@ -34434,7 +34434,7 @@ $as_echo "$as_me: The result from runnin
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *Copyright .*//'` $SED -e 's/ *Copyright .*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
@ -18,9 +18,9 @@
elif test "x$TOOLCHAIN_TYPE" = xclang; then elif test "x$TOOLCHAIN_TYPE" = xclang; then
# clang --version output typically looks like # clang --version output typically looks like
# Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
--- a/make/autoconf/toolchain.m4 2018-06-24 16:07:06.000000000 +0200 --- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4 2020-08-19 00:01:30.294255268 +0200 +++ b/make/autoconf/toolchain.m4
@@ -424,7 +424,7 @@ @@ -424,7 +424,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VER
# Collapse compiler output into a single line # Collapse compiler output into a single line
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT` COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \

4
srcpkgs/openjdk10-bootstrap/patches/fix-path-exception-glibc.patch
View file

@ -16,11 +16,9 @@ Reviewed-by: iveresov, ecaspole
src/hotspot/cpu/x86/globals_x86.hpp | 2 +- src/hotspot/cpu/x86/globals_x86.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
index 423e1b1e478..49073f1834a 100644
--- a/src/hotspot/cpu/x86/globals_x86.hpp --- a/src/hotspot/cpu/x86/globals_x86.hpp
+++ b/src/hotspot/cpu/x86/globals_x86.hpp +++ b/src/hotspot/cpu/x86/globals_x86.hpp
@@ -119,7 +119,7 @@ define_pd_global(bool, ThreadLocalHandshakes, false); @@ -118,7 +118,7 @@ define_pd_global(bool, ThreadLocalHandsh
product(bool, UseStoreImmI16, true, \ product(bool, UseStoreImmI16, true, \
"Use store immediate 16-bits value instruction on x86") \ "Use store immediate 16-bits value instruction on x86") \
\ \

74
srcpkgs/openjdk10-bootstrap/patches/fix-pointer-comparison-gcc12.patch
View file

@ -13,11 +13,9 @@ Reviewed-by: bobv, stuefe
4 files changed, 135 insertions(+), 71 deletions(-) 4 files changed, 135 insertions(+), 71 deletions(-)
create mode 100644 test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java create mode 100644 test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java
diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index c2f135a9e2c7..0b35bb32c5d1 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp --- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp +++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -414,9 +414,9 @@ void OSContainer::init() { @@ -397,9 +397,9 @@ void OSContainer::init() {
} }
@ -29,8 +27,6 @@ index c2f135a9e2c7..0b35bb32c5d1 100644
} else { } else {
return NULL; return NULL;
} }
diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index 5ace80165d92..0a81364fc8d9 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp --- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp +++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -40,7 +40,7 @@ class OSContainer: AllStatic { @@ -40,7 +40,7 @@ class OSContainer: AllStatic {
@ -42,11 +38,9 @@ index 5ace80165d92..0a81364fc8d9 100644
static jlong memory_limit_in_bytes(); static jlong memory_limit_in_bytes();
static jlong memory_and_swap_limit_in_bytes(); static jlong memory_and_swap_limit_in_bytes();
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 4544baa8f762..6d530afcc30a 100644
--- a/src/hotspot/os/linux/os_linux.cpp --- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp
@@ -177,20 +177,17 @@ julong os::Linux::available_memory() { @@ -178,20 +178,17 @@ julong os::Linux::available_memory() {
if (OSContainer::is_containerized()) { if (OSContainer::is_containerized()) {
jlong mem_limit, mem_usage; jlong mem_limit, mem_usage;
@ -78,7 +72,7 @@ index 4544baa8f762..6d530afcc30a 100644
} }
} }
@@ -201,22 +198,18 @@ julong os::Linux::available_memory() { @@ -202,22 +199,18 @@ julong os::Linux::available_memory() {
} }
julong os::physical_memory() { julong os::physical_memory() {
@ -106,23 +100,22 @@ index 4544baa8f762..6d530afcc30a 100644
log_trace(os)("total system memory: " JLONG_FORMAT, phys_mem); log_trace(os)("total system memory: " JLONG_FORMAT, phys_mem);
return phys_mem; return phys_mem;
} }
@@ -2135,63 +2128,54 @@ void os::Linux::print_full_memory_info(outputStream* st) { @@ -2136,63 +2129,54 @@ void os::Linux::print_full_memory_info(o
} }
void os::Linux::print_container_info(outputStream* st) { void os::Linux::print_container_info(outputStream* st) {
- if (OSContainer::is_containerized()) { - if (OSContainer::is_containerized()) {
- st->print("container (cgroup) information:\n"); - st->print("container (cgroup) information:\n");
+ if (!OSContainer::is_containerized()) { -
+ return;
+ }
- char *p = OSContainer::container_type(); - char *p = OSContainer::container_type();
- if (p == NULL) - if (p == NULL)
- st->print("container_type() failed\n"); - st->print("container_type() failed\n");
- else { - else {
- st->print("container_type: %s\n", p); - st->print("container_type: %s\n", p);
- } - }
+ st->print("container (cgroup) information:\n"); + if (!OSContainer::is_containerized()) {
+ return;
+ }
- p = OSContainer::cpu_cpuset_cpus(); - p = OSContainer::cpu_cpuset_cpus();
- if (p == NULL) - if (p == NULL)
@ -131,8 +124,7 @@ index 4544baa8f762..6d530afcc30a 100644
- st->print("cpu_cpuset_cpus: %s\n", p); - st->print("cpu_cpuset_cpus: %s\n", p);
- free(p); - free(p);
- } - }
+ const char *p_ct = OSContainer::container_type(); + st->print("container (cgroup) information:\n");
+ st->print("container_type: %s\n", p_ct != NULL ? p_ct : "failed");
- p = OSContainer::cpu_cpuset_memory_nodes(); - p = OSContainer::cpu_cpuset_memory_nodes();
- if (p < 0) - if (p < 0)
@ -141,21 +133,22 @@ index 4544baa8f762..6d530afcc30a 100644
- st->print("cpu_memory_nodes: %s\n", p); - st->print("cpu_memory_nodes: %s\n", p);
- free(p); - free(p);
- } - }
+ char *p = OSContainer::cpu_cpuset_cpus(); + const char *p_ct = OSContainer::container_type();
+ st->print("cpu_cpuset_cpus: %s\n", p != NULL ? p : "failed"); + st->print("container_type: %s\n", p_ct != NULL ? p_ct : "failed");
+ free(p);
- int i = OSContainer::active_processor_count(); - int i = OSContainer::active_processor_count();
- if (i < 0) - if (i < 0)
- st->print("active_processor_count() failed\n"); - st->print("active_processor_count() failed\n");
- else - else
- st->print("active_processor_count: %d\n", i); - st->print("active_processor_count: %d\n", i);
+ 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(); + p = OSContainer::cpu_cpuset_memory_nodes();
+ st->print("cpu_memory_nodes: %s\n", p != NULL ? p : "failed"); + st->print("cpu_memory_nodes: %s\n", p != NULL ? p : "failed");
+ free(p); + free(p);
+
- i = OSContainer::cpu_quota();
- st->print("cpu_quota: %d\n", i);
+ int i = OSContainer::active_processor_count(); + int i = OSContainer::active_processor_count();
+ if (i > 0) { + if (i > 0) {
+ st->print("active_processor_count: %d\n", i); + st->print("active_processor_count: %d\n", i);
@ -163,52 +156,51 @@ index 4544baa8f762..6d530afcc30a 100644
+ st->print("active_processor_count: failed\n"); + st->print("active_processor_count: failed\n");
+ } + }
- i = OSContainer::cpu_period(); - i = OSContainer::cpu_quota();
- st->print("cpu_period: %d\n", i); - st->print("cpu_quota: %d\n", i);
+ i = OSContainer::cpu_quota(); + i = OSContainer::cpu_quota();
+ st->print("cpu_quota: %d\n", i); + st->print("cpu_quota: %d\n", i);
- i = OSContainer::cpu_shares(); - i = OSContainer::cpu_period();
- st->print("cpu_shares: %d\n", i); - st->print("cpu_period: %d\n", i);
+ i = OSContainer::cpu_period(); + i = OSContainer::cpu_period();
+ st->print("cpu_period: %d\n", i); + st->print("cpu_period: %d\n", i);
- jlong j = OSContainer::memory_limit_in_bytes(); - i = OSContainer::cpu_shares();
- st->print("memory_limit_in_bytes: " JLONG_FORMAT "\n", j); - st->print("cpu_shares: %d\n", i);
+ i = OSContainer::cpu_shares(); + i = OSContainer::cpu_shares();
+ st->print("cpu_shares: %d\n", i); + st->print("cpu_shares: %d\n", i);
- j = OSContainer::memory_and_swap_limit_in_bytes(); - jlong j = OSContainer::memory_limit_in_bytes();
- st->print("memory_and_swap_limit_in_bytes: " JLONG_FORMAT "\n", j); - st->print("memory_limit_in_bytes: " JLONG_FORMAT "\n", j);
+ jlong j = OSContainer::memory_limit_in_bytes(); + jlong j = OSContainer::memory_limit_in_bytes();
+ st->print("memory_limit_in_bytes: " JLONG_FORMAT "\n", j); + st->print("memory_limit_in_bytes: " JLONG_FORMAT "\n", j);
- j = OSContainer::memory_soft_limit_in_bytes(); - j = OSContainer::memory_and_swap_limit_in_bytes();
- st->print("memory_soft_limit_in_bytes: " JLONG_FORMAT "\n", j); - st->print("memory_and_swap_limit_in_bytes: " JLONG_FORMAT "\n", j);
+ j = OSContainer::memory_and_swap_limit_in_bytes(); + j = OSContainer::memory_and_swap_limit_in_bytes();
+ st->print("memory_and_swap_limit_in_bytes: " JLONG_FORMAT "\n", j); + st->print("memory_and_swap_limit_in_bytes: " JLONG_FORMAT "\n", j);
- j = OSContainer::OSContainer::memory_usage_in_bytes(); - j = OSContainer::memory_soft_limit_in_bytes();
- st->print("memory_usage_in_bytes: " JLONG_FORMAT "\n", j); - st->print("memory_soft_limit_in_bytes: " JLONG_FORMAT "\n", j);
+ j = OSContainer::memory_soft_limit_in_bytes(); + j = OSContainer::memory_soft_limit_in_bytes();
+ st->print("memory_soft_limit_in_bytes: " JLONG_FORMAT "\n", j); + st->print("memory_soft_limit_in_bytes: " JLONG_FORMAT "\n", j);
- j = OSContainer::OSContainer::memory_usage_in_bytes();
- st->print("memory_usage_in_bytes: " JLONG_FORMAT "\n", j);
+ j = OSContainer::OSContainer::memory_usage_in_bytes();
+ st->print("memory_usage_in_bytes: " JLONG_FORMAT "\n", j);
- j = OSContainer::OSContainer::memory_max_usage_in_bytes(); - j = OSContainer::OSContainer::memory_max_usage_in_bytes();
- st->print("memory_max_usage_in_bytes: " JLONG_FORMAT "\n", j); - st->print("memory_max_usage_in_bytes: " JLONG_FORMAT "\n", j);
- st->cr(); - st->cr();
- } - }
+ j = OSContainer::OSContainer::memory_usage_in_bytes();
+ st->print("memory_usage_in_bytes: " JLONG_FORMAT "\n", j);
+
+ j = OSContainer::OSContainer::memory_max_usage_in_bytes(); + j = OSContainer::OSContainer::memory_max_usage_in_bytes();
+ st->print("memory_max_usage_in_bytes: " JLONG_FORMAT "\n", j); + st->print("memory_max_usage_in_bytes: " JLONG_FORMAT "\n", j);
+ st->cr(); + st->cr();
} }
void os::print_memory_info(outputStream* st) { void os::print_memory_info(outputStream* st) {
diff --git a/test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java b/test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java
new file mode 100644
index 000000000000..be16dab76b7a
--- /dev/null --- /dev/null
+++ b/test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java +++ b/test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@

2
srcpkgs/openjdk10-bootstrap/patches/make-4.3.patch
View file

@ -3,8 +3,6 @@ Upstream: Yes
Upstream-Url: https://bugs.openjdk.java.net/browse/JDK-8237879 Upstream-Url: https://bugs.openjdk.java.net/browse/JDK-8237879
Author: Simon Frankenberger <simon-alpine@fraho.eu> Author: Simon Frankenberger <simon-alpine@fraho.eu>
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 170c3ed..697f9d2 100644
--- a/make/common/MakeBase.gmk --- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk +++ b/make/common/MakeBase.gmk
@@ -967,7 +967,9 @@ DependOnVariableHelper = \ @@ -967,7 +967,9 @@ DependOnVariableHelper = \

11
srcpkgs/openjdk10-bootstrap/patches/xxx-fix-mem-limit.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -204,7 +204,7 @@ julong os::physical_memory() {
jlong mem_limit;
if ((mem_limit = OSContainer::memory_limit_in_bytes()) > 0) {
log_trace(os)("total container memory: " JLONG_FORMAT, mem_limit);
- return phys_mem;
+ return mem_limit;
}
log_debug(os, container)("container memory limit %s: " JLONG_FORMAT ", using host value",
mem_limit == OSCONTAINER_ERROR ? "failed" : "unlimited", mem_limit);

2
srcpkgs/openjdk10-bootstrap/template
View file

@ -2,7 +2,7 @@
_final_jdk_home="usr/lib/jvm/java-10-openjdk" _final_jdk_home="usr/lib/jvm/java-10-openjdk"
pkgname=openjdk10-bootstrap pkgname=openjdk10-bootstrap
version=10.0.2p13 version=10.0.2p13
revision=3 revision=4
_repo_ver=${version/p/+} _repo_ver=${version/p/+}
archs="x86_64* i686* aarch64* arm* ppc64*" archs="x86_64* i686* aarch64* arm* ppc64*"
build_style=gnu-configure build_style=gnu-configure