rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revise Shenandoah PR3634 patch following upstream discussion.

Browse Source
This commit is contained in:
Andrew John Hughes 2018-11-19 16:54:37 +00:00
parent e68876bb37
commit 66b29a9af5
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java-1.8.0-openjdk.spec
View File

@ -966,7 +966,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 9%{?dist}
Release: 10%{?dist}
# 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
@ -2328,6 +2328,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Tue Nov 13 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.191.b12-10
- Revise Shenandoah PR3634 patch following upstream discussion.
* Wed Nov 07 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.191.b12-9
- headfull suggests of cups, replaced by Requires of cups-libs in headless

30
pr3634.patch
View File

@ -1,16 +1,14 @@
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
@@ -55,10 +55,10 @@
"Size of the Shenandoah regions. " \
"Determined automatically by default.") \
\
- experimental(uintx, ShenandoahMinRegionSize, 256 * K, \
+ experimental(size_t, ShenandoahMinRegionSize, 256 * K, \
"Minimum heap region size. ") \
\
- experimental(uintx, ShenandoahMaxRegionSize, 32 * M, \
+ experimental(size_t, ShenandoahMaxRegionSize, 32 * M, \
"Maximum heap region size. ") \
\
experimental(intx, ShenandoahHumongousThreshold, 100, \
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
@@ -524,8 +524,8 @@
region_size = max_heap_size / ShenandoahTargetNumRegions;
// Now make sure that we don't go over or under our limits.
- region_size = MAX2(ShenandoahMinRegionSize, region_size);
- region_size = MIN2(ShenandoahMaxRegionSize, region_size);
+ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size);
+ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size);
} else {
if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {