提交 24efaef7 编写于 作者: A asaha

Merge

......@@ -707,6 +707,8 @@ b852350a2bc6d5f43006e2be53fb74d148290708 hs25.60-b19
bd9221771f6e34e63b3b340ffcf9906ccf882dae jdk8u60-b19
e01a710549a962cee94728271248a7d89fb56c49 hs25.60-b20
3b6c97747ccc61d189bca64b4afa3ffc13680810 jdk8u60-b20
4b6687a4f2fe84211b8b3b5afb34b5186afbddf6 hs25.60-b21
e0d75c284bd1c09fd7d9ef09627d8a99b88d468d jdk8u60-b21
0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
......
......@@ -211,7 +211,7 @@ void GenMarkSweep::mark_sweep_phase1(int level,
false, // Younger gens are not roots.
true, // activate StrongRootsScope
GenCollectedHeap::SO_None,
GenCollectedHeap::StrongRootsOnly,
ClassUnloading,
&follow_root_closure,
&follow_root_closure,
&follow_cld_closure);
......
......@@ -99,9 +99,7 @@ bool CodeHeap::reserve(size_t reserved_size, size_t committed_size,
// 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();
......
......@@ -1372,6 +1372,12 @@ void Arguments::set_cms_and_parnew_gc_flags() {
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));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册