packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!261 G1Uncommit add G1UncommitLog limit before G1Uncommit

Browse Source 
Merge pull request !261 from kuen/I4M09Y
This commit is contained in:
openeuler-ci-bot 2021-12-11 01:11:45 +00:00 committed by Gitee
commit bac563e080
2 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
G1Uncommit-add-G1UncommitLog-limit-before-G1Uncommit.patch Executable file
View File

@ -0,0 +1,67 @@
From 309b16c487fa42fc65781da3ccf79af67f142ee9 Mon Sep 17 00:00:00 2001
From: mashoubing <mashoubing1@huawei.com>
Date: Mon, 6 Dec 2021 16:05:39 +0800
Subject: [PATCH] G1Uncommit: add G1UncommitLog limit before G1Uncommit log
message
---
.../src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 8 +++++---
.../share/vm/gc_implementation/g1/g1UncommitThread.cpp | 4 +++-
.../share/vm/gc_implementation/g1/heapRegionManager.cpp | 8 +++++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index 6ee33fd05..f7266c9c4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -2221,9 +2221,11 @@ void G1CollectedHeap::shrink_heap_at_remark() {
uint num_candidate_to_remove = (uint)(resize_amount / HeapRegion::GrainBytes);
uint count = _hrm.extract_uncommit_list(num_candidate_to_remove);
- gclog_or_tty->print(" [G1Uncommit list " UINT32_FORMAT ", remaining " UINT32_FORMAT
- ", free list " UINT32_FORMAT "]",
- count, length - count, _hrm.num_free_regions());
+ if (G1UncommitLog) {
+ gclog_or_tty->print(" [G1Uncommit list " UINT32_FORMAT ", remaining " UINT32_FORMAT
+ ", free list " UINT32_FORMAT "]",
+ count, length - count, _hrm.num_free_regions());
+ }
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1UncommitThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1UncommitThread.cpp
index 503218917..280313b69 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1UncommitThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1UncommitThread.cpp
@@ -190,7 +190,9 @@ bool PeriodicGC::should_start_periodic_gc() {
if (g1p->os_load() < G1PeriodicGCLoadThreshold || !G1PeriodicGCLoadThreshold) {
return true;
}
- gclog_or_tty->print_cr("[G1Uncommit] Periodic GC request denied, skipping!");
+ if (G1UncommitLog) {
+ gclog_or_tty->print_cr("[G1Uncommit] Periodic GC request denied, skipping!");
+ }
return false;
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
index d31073f9f..83513b3b8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
@@ -577,9 +577,11 @@ uint HeapRegionManager::extract_uncommit_list(uint num_candidate_to_remove) {
assert_at_safepoint(true /* should_be_vm_thread */);
double start_up_sec = os::elapsedTime();
if (start_up_sec < G1UncommitDelay) {
- gclog_or_tty->date_stamp(PrintGCDateStamps);
- gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("start up seconds:%lf, less than G1UncommitDelay, will not uncommit.", start_up_sec);
+ if (G1UncommitLog) {
+ gclog_or_tty->date_stamp(PrintGCDateStamps);
+ gclog_or_tty->stamp(PrintGCTimeStamps);
+ gclog_or_tty->print_cr("start up seconds:%lf, less than G1UncommitDelay, will not uncommit.", start_up_sec);
+ }
return 0;
}
--
2.22.0

7
openjdk-1.8.0.spec
View File

@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 5
Release: 6
# 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
@ -1120,6 +1120,7 @@ Patch222: 8273111-Default-timezone-should-return-zone-ID-if-locatiome-is-valid-b
Patch223: 8233280-Remove-GCLockerInvokesConcurrent-relative-logic-for-G1.patch
Patch224: G1Ucommit-Refactor-Trigger-mechanism.patch
Patch225: G1-Full-GC-parallel-mark.patch
Patch226: G1Uncommit-add-G1UncommitLog-limit-before-G1Uncommit.patch
# 8u312
@ -1590,6 +1591,7 @@ pushd %{top_level_dir_name}
%patch223 -p1
%patch224 -p1
%patch225 -p1
%patch226 -p1
popd
# System library fixes
@ -2207,6 +2209,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.6
- add G1Uncommit-add-G1UncommitLog-limit-before-G1Uncommit.patch
* Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.5
- add G1-Full-GC-parallel-mark.patch