Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Mon Jun 22 11:34:42 2015 -0700
     1.2 +++ b/.hgtags	Wed Jun 24 15:36:40 2015 -0700
     1.3 @@ -707,6 +707,8 @@
     1.4  bd9221771f6e34e63b3b340ffcf9906ccf882dae jdk8u60-b19
     1.5  e01a710549a962cee94728271248a7d89fb56c49 hs25.60-b20
     1.6  3b6c97747ccc61d189bca64b4afa3ffc13680810 jdk8u60-b20
     1.7 +4b6687a4f2fe84211b8b3b5afb34b5186afbddf6 hs25.60-b21
     1.8 +e0d75c284bd1c09fd7d9ef09627d8a99b88d468d jdk8u60-b21
     1.9  0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
    1.10  9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
    1.11  0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00

     2.1 --- a/src/share/vm/memory/genMarkSweep.cpp	Mon Jun 22 11:34:42 2015 -0700
     2.2 +++ b/src/share/vm/memory/genMarkSweep.cpp	Wed Jun 24 15:36:40 2015 -0700
     2.3 @@ -211,7 +211,7 @@
     2.4                           false, // Younger gens are not roots.
     2.5                           true,  // activate StrongRootsScope
     2.6                           GenCollectedHeap::SO_None,
     2.7 -                         GenCollectedHeap::StrongRootsOnly,
     2.8 +                         ClassUnloading,
     2.9                           &follow_root_closure,
    2.10                           &follow_root_closure,
    2.11                           &follow_cld_closure);

     3.1 --- a/src/share/vm/memory/heap.cpp	Mon Jun 22 11:34:42 2015 -0700
     3.2 +++ b/src/share/vm/memory/heap.cpp	Wed Jun 24 15:36:40 2015 -0700
     3.3 @@ -99,9 +99,7 @@
     3.4    // Reserve and initialize space for _memory.
     3.5    size_t page_size = os::vm_page_size();
     3.6    if (os::can_execute_large_page_memory()) {
     3.7 -    const size_t min_pages = 8;
     3.8 -    page_size = MIN2(os::page_size_for_region_aligned(committed_size, min_pages),
     3.9 -                     os::page_size_for_region_aligned(reserved_size, min_pages));
    3.10 +    page_size = os::page_size_for_region_unaligned(reserved_size, 8);
    3.11    }
    3.12  
    3.13    const size_t granularity = os::vm_allocation_granularity();

     4.1 --- a/src/share/vm/runtime/arguments.cpp	Mon Jun 22 11:34:42 2015 -0700
     4.2 +++ b/src/share/vm/runtime/arguments.cpp	Wed Jun 24 15:36:40 2015 -0700
     4.3 @@ -1372,6 +1372,12 @@
     4.4    if (!FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim) || !FLAG_IS_DEFAULT(OldPLABWeight)) {
     4.5      CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight);
     4.6    }
     4.7 +
     4.8 +  if (!ClassUnloading) {
     4.9 +    FLAG_SET_CMDLINE(bool, CMSClassUnloadingEnabled, false);
    4.10 +    FLAG_SET_CMDLINE(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false);
    4.11 +  }
    4.12 +
    4.13    if (PrintGCDetails && Verbose) {
    4.14      tty->print_cr("MarkStackSize: %uk  MarkStackSizeMax: %uk",
    4.15        (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));