!207 I407YB: fix run SPECjvm2008 failed on 32 bit system

From: @kuenking111
Reviewed-by: @jvmboy
Signed-off-by: @jvmboy
This commit is contained in:
openeuler-ci-bot 2021-07-12 07:43:25 +00:00 committed by Gitee
commit 0dfcdc678c
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,30 @@
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
index cf2812597..a8a87cc1b 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
@@ -60,12 +60,6 @@ jint ParallelScavengeHeap::initialize() {
_collector_policy->initialize_all();
const size_t heap_size = _collector_policy->max_heap_byte_size();
- _workers = new FlexibleWorkGang("GC Thread",ParallelGCThreads, true, false);
- if (_workers == NULL) {
- vm_exit_during_initialization("Failed necessary allocation.");
- } else {
- _workers->initialize_workers();
- }
ReservedSpace heap_rs = Universe::reserve_heap(heap_size, _collector_policy->heap_alignment());
MemTracker::record_virtual_memory_type((address)heap_rs.base(), mtJavaHeap);
@@ -130,6 +124,12 @@ jint ParallelScavengeHeap::initialize() {
// Set up the GCTaskManager
_gc_task_manager = GCTaskManager::create(ParallelGCThreads);
+ _workers = new FlexibleWorkGang("GC Thread",ParallelGCThreads, true, false);
+ if (_workers == NULL) {
+ vm_exit_during_initialization("Failed necessary allocation.");
+ } else {
+ _workers->initialize_workers();
+ }
if (UseParallelOldGC && !PSParallelCompact::initialize()) {
return JNI_ENOMEM;

View File

@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 17 Release: 18
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -1111,6 +1111,7 @@ Patch197: implementation_of_Blas_hotspot_function_in_Intrinsics.patch
Patch198: fix_G1GC_memory_leak_in_numa.patch Patch198: fix_G1GC_memory_leak_in_numa.patch
Patch199: delete_untrustworthy_cacert_soneraclass2ca.patch Patch199: delete_untrustworthy_cacert_soneraclass2ca.patch
Patch200: Fix-ECDH-and-DH-memory-usage.patch Patch200: Fix-ECDH-and-DH-memory-usage.patch
Patch201: fix_run_SPECjvm2008_failed_on_32_bit_system.patch
############################################# #############################################
# #
@ -1570,6 +1571,7 @@ pushd %{top_level_dir_name}
%patch198 -p1 %patch198 -p1
%patch199 -p1 %patch199 -p1
%patch200 -p1 %patch200 -p1
%patch201 -p1
popd popd
# System library fixes # System library fixes
@ -2185,6 +2187,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Thu Jul 12 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.292-b10.18
- fix run SPECjvm2008 failed on 32 bit system
* Thu Jul 8 2021 noah <hedongbo@huawei.com> - 1:1.8.0.292-b10.17 * Thu Jul 8 2021 noah <hedongbo@huawei.com> - 1:1.8.0.292-b10.17
- remove debug log to reduce build time - remove debug log to reduce build time