diff --git a/numa_mem_leak.patch b/numa_mem_leak.patch new file mode 100755 index 0000000000000000000000000000000000000000..4a7613177cfb75e51cd77bc810cf34887ae4f81f --- /dev/null +++ b/numa_mem_leak.patch @@ -0,0 +1,37 @@ +diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp +index 22f177f17..6b2714f5d 100644 +--- a/src/hotspot/os/linux/os_linux.hpp ++++ b/src/hotspot/os/linux/os_linux.hpp +@@ -377,8 +377,8 @@ class Linux { + } + // Check if node is in bound node set. + static bool isnode_in_bound_nodes(int node) { +- if (_numa_get_membind != NULL && _numa_bitmask_isbitset != NULL) { +- return _numa_bitmask_isbitset(_numa_get_membind(), node); ++ if (_numa_membind_bitmask != NULL && _numa_bitmask_isbitset != NULL) { ++ return _numa_bitmask_isbitset(_numa_membind_bitmask, node); + } else { + return false; + } +@@ -387,19 +387,17 @@ class Linux { + // Returns true if bound to a single numa node, otherwise returns false. + static bool isbound_to_single_node() { + int nodes = 0; +- struct bitmask* bmp = NULL; + unsigned int node = 0; + unsigned int highest_node_number = 0; + +- if (_numa_get_membind != NULL && _numa_max_node != NULL && _numa_bitmask_isbitset != NULL) { +- bmp = _numa_get_membind(); ++ if (_numa_membind_bitmask != NULL && _numa_max_node != NULL && _numa_bitmask_isbitset != NULL) { + highest_node_number = _numa_max_node(); + } else { + return false; + } + + for (node = 0; node <= highest_node_number; node++) { +- if (_numa_bitmask_isbitset(bmp, node)) { ++ if (_numa_bitmask_isbitset(_numa_membind_bitmask, node)) { + nodes++; + } + } diff --git a/openjdk-11.spec b/openjdk-11.spec index ad670b8dd901644ad0c97f2cc60318e28cf28849..70f5a28b6fa0f34adb1ac8f8ef2af7cb631e6729 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -853,6 +853,7 @@ Patch69: G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch #11.0.11 Patch70: 8264640.patch +Patch71: numa_mem_leak.patch BuildRequires: autoconf BuildRequires: alsa-lib-devel @@ -1127,6 +1128,7 @@ pushd %{top_level_dir_name} %patch68 -p1 %patch69 -p1 %patch70 -p1 +%patch71 -p1 popd # openjdk # %patch1000 @@ -1630,6 +1632,9 @@ require "copy_jdk_configs.lua" %changelog +* Mon May 31 2021 kuenking111 - 1:11.0.11.9-2 +- add numa_mem_leak.patch + * Fri May 28 2021 kuenking111 - 1:11.0.11.9-1 - add 8264640.patch