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

!210 Merge master

Browse Source 
From: @jvmboy
Reviewed-by: @jiangfeilong1003
Signed-off-by: @jiangfeilong1003
This commit is contained in:
openeuler-ci-bot 2021-07-13 09:24:26 +00:00 committed by Gitee
commit c0f1303c71
3 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Fix-RSACipher-memory-usage.patch Normal file
View File

@ -0,0 +1,20 @@
commit 59b41b317972a826715c705da489bb36d1a0a5a9
Author: noah <hedongbo@huawei.com>
Date: Mon Jul 12 15:54:23 2021 +0800
I408SI: Fix RSACipher memory usage
diff --git a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c
index cbab7bdb..d1aedf5f 100644
--- a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c
+++ b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c
@@ -82,6 +82,9 @@ cleanup:
if (inBytes != NULL) {
(*env)->ReleaseByteArrayElements(env, in, inBytes, 0);
}
+ if (rsa != NULL) {
+ RSA_free(rsa);
+ }
return resultSize;
}

30
fix_run_SPECjvm2008_failed_on_32_bit_system.patch Executable file
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;

16
openjdk-1.8.0.spec
View File

@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 16
Release: 19
# 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
@ -1111,6 +1111,8 @@ Patch197: implementation_of_Blas_hotspot_function_in_Intrinsics.patch
Patch198: fix_G1GC_memory_leak_in_numa.patch
Patch199: delete_untrustworthy_cacert_soneraclass2ca.patch
Patch200: Fix-ECDH-and-DH-memory-usage.patch
Patch201: fix_run_SPECjvm2008_failed_on_32_bit_system.patch
Patch202: Fix-RSACipher-memory-usage.patch
#############################################
#
@ -1570,6 +1572,8 @@ pushd %{top_level_dir_name}
%patch198 -p1
%patch199 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
popd
# System library fixes
@ -1700,7 +1704,6 @@ fi
make \
JAVAC_FLAGS=-g \
LOG=trace \
SCTP_WERROR= \
${maketargets} || ( pwd; find $top_dir_abs_path -name "hs_err_pid*.log" | xargs cat && false )
@ -2186,6 +2189,15 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Thu Jul 12 2021 noah <hedongbo@huawei.com> - 1:1.8.0.292-b10.19
- add Fix-RSACipher-memory-usage.patch
* 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
- remove debug log to reduce build time
* Mon Jul 5 2021 noah <hedongbo@huawei.com> - 1:1.8.0.292-b10.16
- add Fix-ECDH-and-DH-memory-usage.patch