Mercurial > hg > openjdk > jdk8u > hotspot
changeset 7417:4b6687a4f2fe hs25.60-b21
Merge
| author | amurillo |
|---|---|
| date | Thu, 18 Jun 2015 22:17:33 -0700 |
| parents | a3bbad4a7ea1 (current diff) 9d514a2d02ff (diff) |
| children | e0d75c284bd1 |
| files | |
| diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot_version Wed Jun 17 11:42:10 2015 -0700 +++ b/make/hotspot_version Thu Jun 18 22:17:33 2015 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=25 HS_MINOR_VER=60 -HS_BUILD_NUMBER=20 +HS_BUILD_NUMBER=21 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/share/vm/memory/genMarkSweep.cpp Wed Jun 17 11:42:10 2015 -0700 +++ b/src/share/vm/memory/genMarkSweep.cpp Thu Jun 18 22:17:33 2015 -0700 @@ -211,7 +211,7 @@ false, // Younger gens are not roots. true, // activate StrongRootsScope GenCollectedHeap::SO_None, - GenCollectedHeap::StrongRootsOnly, + ClassUnloading, &follow_root_closure, &follow_root_closure, &follow_cld_closure);
--- a/src/share/vm/memory/heap.cpp Wed Jun 17 11:42:10 2015 -0700 +++ b/src/share/vm/memory/heap.cpp Thu Jun 18 22:17:33 2015 -0700 @@ -99,9 +99,7 @@ // Reserve and initialize space for _memory. size_t page_size = os::vm_page_size(); if (os::can_execute_large_page_memory()) { - const size_t min_pages = 8; - page_size = MIN2(os::page_size_for_region_aligned(committed_size, min_pages), - os::page_size_for_region_aligned(reserved_size, min_pages)); + page_size = os::page_size_for_region_unaligned(reserved_size, 8); } const size_t granularity = os::vm_allocation_granularity();
--- a/src/share/vm/runtime/arguments.cpp Wed Jun 17 11:42:10 2015 -0700 +++ b/src/share/vm/runtime/arguments.cpp Thu Jun 18 22:17:33 2015 -0700 @@ -1372,6 +1372,12 @@ if (!FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim) || !FLAG_IS_DEFAULT(OldPLABWeight)) { CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight); } + + if (!ClassUnloading) { + FLAG_SET_CMDLINE(bool, CMSClassUnloadingEnabled, false); + FLAG_SET_CMDLINE(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false); + } + if (PrintGCDetails && Verbose) { tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk", (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));