Mercurial > hg > graal-jvmci-8
changeset 23160:169e29e8313f
Merge
author | asaha |
---|---|
date | Wed, 24 Jun 2015 11:08:52 -0700 |
parents | 06114526675f (current diff) 049a2c17a4f2 (diff) |
children | 696dea43dfe9 cdb05a5db1e3 |
files | .hgtags make/hotspot_version |
diffstat | 5 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 17 21:53:15 2015 -0700 +++ b/.hgtags Wed Jun 24 11:08:52 2015 -0700 @@ -674,3 +674,5 @@ bd9221771f6e34e63b3b340ffcf9906ccf882dae jdk8u60-b19 e01a710549a962cee94728271248a7d89fb56c49 hs25.60-b20 3b6c97747ccc61d189bca64b4afa3ffc13680810 jdk8u60-b20 +4b6687a4f2fe84211b8b3b5afb34b5186afbddf6 hs25.60-b21 +e0d75c284bd1c09fd7d9ef09627d8a99b88d468d jdk8u60-b21
--- a/make/hotspot_version Wed Jun 17 21:53:15 2015 -0700 +++ b/make/hotspot_version Wed Jun 24 11:08:52 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 21:53:15 2015 -0700 +++ b/src/share/vm/memory/genMarkSweep.cpp Wed Jun 24 11:08:52 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 21:53:15 2015 -0700 +++ b/src/share/vm/memory/heap.cpp Wed Jun 24 11:08:52 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 21:53:15 2015 -0700 +++ b/src/share/vm/runtime/arguments.cpp Wed Jun 24 11:08:52 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));