Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/tools/ProjectCreator/BuildConfig.java	Fri Feb 03 12:08:55 2012 -0800
     1.2 +++ b/src/share/tools/ProjectCreator/BuildConfig.java	Fri Feb 03 12:20:11 2012 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -243,6 +243,7 @@
    1.11          sysDefines.add("_WINDOWS");
    1.12          sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\"");
    1.13          sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\"");
    1.14 +        sysDefines.add("INCLUDE_TRACE");
    1.15          sysDefines.add("_JNI_IMPLEMENTATION_");
    1.16          if (vars.get("PlatformName").equals("Win32")) {
    1.17              sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\"");

     2.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Fri Feb 03 12:08:55 2012 -0800
     2.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Fri Feb 03 12:20:11 2012 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -5594,6 +5594,7 @@
    2.11      GenCollectedHeap::StrongRootsScope srs(gch);
    2.12      workers->run_task(&tsk);
    2.13    } else {
    2.14 +    ReferenceProcessorMTDiscoveryMutator mt(ref_processor(), false);
    2.15      GenCollectedHeap::StrongRootsScope srs(gch);
    2.16      tsk.work(0);
    2.17    }
    2.18 @@ -5608,6 +5609,8 @@
    2.19    ResourceMark rm;
    2.20    HandleMark   hm;
    2.21    GenCollectedHeap* gch = GenCollectedHeap::heap();
    2.22 +  ReferenceProcessorMTDiscoveryMutator mt(ref_processor(), false);
    2.23 +
    2.24    MarkRefsIntoAndScanClosure
    2.25      mrias_cl(_span, ref_processor(), &_markBitMap, &_modUnionTable,
    2.26               &_markStack, &_revisitStack, this,

     3.1 --- a/src/share/vm/runtime/arguments.cpp	Fri Feb 03 12:08:55 2012 -0800
     3.2 +++ b/src/share/vm/runtime/arguments.cpp	Fri Feb 03 12:20:11 2012 -0800
     3.3 @@ -1400,10 +1400,11 @@
     3.4  
     3.5  void Arguments::set_parallel_gc_flags() {
     3.6    assert(UseParallelGC || UseParallelOldGC, "Error");
     3.7 -  // If parallel old was requested, automatically enable parallel scavenge.
     3.8 -  if (UseParallelOldGC && !UseParallelGC && FLAG_IS_DEFAULT(UseParallelGC)) {
     3.9 -    FLAG_SET_DEFAULT(UseParallelGC, true);
    3.10 +  // Enable ParallelOld unless it was explicitly disabled (cmd line or rc file).
    3.11 +  if (FLAG_IS_DEFAULT(UseParallelOldGC)) {
    3.12 +    FLAG_SET_DEFAULT(UseParallelOldGC, true);
    3.13    }
    3.14 +  FLAG_SET_DEFAULT(UseParallelGC, true);
    3.15  
    3.16    // If no heap maximum was requested explicitly, use some reasonable fraction
    3.17    // of the physical memory, up to a maximum of 1GB.