Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Mon Jan 30 15:21:57 2012 +0100
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Thu Feb 02 16:05:17 2012 -0800
     1.3 @@ -1400,10 +1400,11 @@
     1.4  
     1.5  void Arguments::set_parallel_gc_flags() {
     1.6    assert(UseParallelGC || UseParallelOldGC, "Error");
     1.7 -  // If parallel old was requested, automatically enable parallel scavenge.
     1.8 -  if (UseParallelOldGC && !UseParallelGC && FLAG_IS_DEFAULT(UseParallelGC)) {
     1.9 -    FLAG_SET_DEFAULT(UseParallelGC, true);
    1.10 +  // Enable ParallelOld unless it was explicitly disabled (cmd line or rc file).
    1.11 +  if (FLAG_IS_DEFAULT(UseParallelOldGC)) {
    1.12 +    FLAG_SET_DEFAULT(UseParallelOldGC, true);
    1.13    }
    1.14 +  FLAG_SET_DEFAULT(UseParallelGC, true);
    1.15  
    1.16    // If no heap maximum was requested explicitly, use some reasonable fraction
    1.17    // of the physical memory, up to a maximum of 1GB.