From 68def87080d4a4d46548c7d8cbdad1c9fc0be364 Mon Sep 17 00:00:00 2001
From: kuenking111 <wangkun49@huawei.com>
Date: Wed, 16 Jun 2021 16:24:22 +0800
Subject: [PATCH] I3VT8V: fix G1GC memory leak in numa

---
 fix_G1GC_memory_leak_in_numa.patch | 38 ++++++++++++++++++++++++++++++
 openjdk-1.8.0.spec                 |  7 +++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100755 fix_G1GC_memory_leak_in_numa.patch

diff --git a/fix_G1GC_memory_leak_in_numa.patch b/fix_G1GC_memory_leak_in_numa.patch
new file mode 100755
index 0000000..5bf5185
--- /dev/null
+++ b/fix_G1GC_memory_leak_in_numa.patch
@@ -0,0 +1,38 @@
+diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
+index 9b26168a8..f6a80bf8d 100644
+--- a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
++++ b/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
+@@ -45,6 +45,7 @@ protected:
+ public:
+    G1Allocator(G1CollectedHeap* heap) :
+      _g1h(heap), _summary_bytes_used(0) { }
++   virtual ~G1Allocator() { }
+ 
+    // Node index of current thread.
+    virtual uint current_node_index() const = 0;
+@@ -126,7 +127,7 @@ protected:
+ 
+ public:
+   G1DefaultAllocator(G1CollectedHeap* heap);
+-  ~G1DefaultAllocator();
++  virtual ~G1DefaultAllocator();
+ 
+   uint current_node_index() const;
+   uint num_nodes() { return (uint)_num_alloc_regions; }
+@@ -253,6 +254,7 @@ protected:
+ 
+ public:
+   G1ParGCAllocator(G1CollectedHeap* g1h);
++  virtual ~G1ParGCAllocator() { }
+ 
+   static G1ParGCAllocator* create_allocator(G1CollectedHeap* g1h);
+ 
+@@ -308,7 +310,7 @@ class G1DefaultParGCAllocator : public G1ParGCAllocator {
+ 
+ public:
+   G1DefaultParGCAllocator(G1CollectedHeap* g1h);
+-  ~G1DefaultParGCAllocator();
++  virtual ~G1DefaultParGCAllocator();
+ 
+   virtual G1ParGCAllocBuffer* alloc_buffer(InCSetState dest, AllocationContext_t context, uint node_index) {
+     assert(dest.is_valid(),
diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index a818907..1770944 100644
--- a/openjdk-1.8.0.spec
+++ b/openjdk-1.8.0.spec
@@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 12
+Release: 13
 # 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
@@ -1108,6 +1108,7 @@ Patch194: modify_the_default_iteration_time_and_forks_in_the_JMH_of_KAEProvider.
 Patch195: support_CMS_parallel_inspection.patch
 Patch196: g1gc-numa-aware-Implementation.patch
 Patch197: implementation_of_Blas_hotspot_function_in_Intrinsics.patch
+Patch198: fix_G1GC_memory_leak_in_numa.patch
 
 #############################################
 #
@@ -1564,6 +1565,7 @@ pushd %{top_level_dir_name}
 %patch195 -p1
 %patch196 -p1
 %patch197 -p1
+%patch198 -p1
 popd
 
 # System library fixes
@@ -2180,6 +2182,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Wed Jun 16 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.292-b10.13
+- add fix_G1GC_memory_leak_in_numa.patch
+
 * Sat Jun 12 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.292-b10.12
 - add implementation_of_Blas_hotspot_function_in_Intrinsics.patch
 
-- 
Gitee