diff --git a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch index 530d1817e1cc406a5c344806620f120451188090..127168dbd09be67ac6877af3d5601d88dc208ac4 100755 --- a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +++ b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch @@ -367,4 +367,4 @@ index 000000000..85b49171c --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+11.0.16.0.13 ++11.0.17.0.13 diff --git a/PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch b/PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch old mode 100755 new mode 100644 index e510108be4557831636286a330f9a3735368be9f..6030300b1a4979e9026ed3ed1aa50be8c33af347 --- a/PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch +++ b/PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch @@ -1,3 +1,13 @@ +From c470ac79015ad99f1760784cbffcf4b92d5bc8dc Mon Sep 17 00:00:00 2001 +From: DXwangg +Date: Wed, 26 Oct 2022 12:52:55 +0800 +Subject: [PATCH] qqqqq + +--- + .../share/gc/parallel/parallel_globals.hpp | 6 +++++- + .../gc/parallel/psPromotionManager.inline.hpp | 18 ++++++++++++++++-- + 2 files changed, 21 insertions(+), 3 deletions(-) + diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp index 5461bf04f..75ee84d4f 100644 --- a/src/hotspot/share/gc/parallel/parallel_globals.hpp @@ -15,10 +25,24 @@ index 5461bf04f..75ee84d4f 100644 #endif // SHARE_GC_PARALLEL_PARALLEL_GLOBALS_HPP diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp -index cc5a4aa98..9bf45f82b 100644 +index cc5a4aa98..5a71ca307 100644 --- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp -@@ -218,8 +218,15 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) { +@@ -35,6 +35,7 @@ + #include "logging/log.hpp" + #include "oops/access.inline.hpp" + #include "oops/oop.inline.hpp" ++#include "runtime/prefetch.inline.hpp" + + inline PSPromotionManager* PSPromotionManager::manager_array(uint index) { + assert(_manager_array != NULL, "access of NULL manager_array"); +@@ -214,12 +215,21 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) { + + assert(new_obj != NULL, "allocation should have succeeded"); + ++ Prefetch::write(new_obj, PrefetchCopyIntervalInBytes); ++ + // Copy obj Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size); // Now we have to CAS in the header. @@ -36,14 +60,17 @@ index cc5a4aa98..9bf45f82b 100644 // We won any races, we "own" this object. assert(new_obj == o->forwardee(), "Sanity"); -@@ -275,6 +282,10 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) { +@@ -275,6 +285,10 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) { // This code must come after the CAS test, or it will print incorrect // information. + // When UsePSRelaxedForwardee is true or object o is gc leaf, CAS failed threads can't access forwardee's content, -+ // as relaxed CAS cann't gurantee new obj's content visible for these CAS failed threads.The below log output is ++ // as relaxed CAS cann't gurantee new obj's content visible for these CAS failed threads.The below log output is + // dangerous.So we just support UsePSRelaxedForwardee and gc leaf in product. + // Everywhere access forwardee's content must be careful. log_develop_trace(gc, scavenge)("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}", should_scavenge(&new_obj) ? "copying" : "tenuring", new_obj->klass()->internal_name(), p2i((void *)o), p2i((void *)new_obj), new_obj->size()); +-- +2.30.1 (Apple Git-130) + diff --git a/jdk-updates-jdk11u-jdk-11.0.17-6.tar.xz b/jdk-updates-jdk11u-jdk-11.0.17-ga.tar.xz similarity index 84% rename from jdk-updates-jdk11u-jdk-11.0.17-6.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.17-ga.tar.xz index a9edfc0a5ea734f8ad140b963a05425602f63283..b4825d78e3e1be0a59d15c085e7b85d2ae60d5d6 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.17-6.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.17-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 095bf9f141f83a532bcd4059e411001833033194..be34e76221e123886c57c4f75594263779bd3de2 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -130,12 +130,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 6 +%global buildver 8 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.17-6 +%global revision jdk-11.0.17-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -886,6 +886,7 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils # elfutils only are OK for build without AOT BuildRequires: elfutils-devel +BuildRequires: elfutils-extra BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: giflib-devel @@ -1677,6 +1678,11 @@ cjc.mainProgram(arg) %changelog +* Wed Oct 19 2022 DXwangg - 1:11.0.17.8-0 +- update to 11.0.17+8(GA) +- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +- modified PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch + * Mon Sep 19 2022 DXwangg - 1:11.0.17.6-0 - update to 11.0.17+5 - modified NUMA-Aware-Implementation-humongous-region.patch