Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Mon Dec 08 18:57:33 2014 +0100
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Thu Aug 07 09:35:08 2014 +0200
     1.3 @@ -343,23 +343,8 @@
     1.4  
     1.5    assert((ParallelGCThreads > 0) || worker_i == 0, "invariant");
     1.6  
     1.7 -  // The two flags below were introduced temporarily to serialize
     1.8 -  // the updating and scanning of remembered sets. There are some
     1.9 -  // race conditions when these two operations are done in parallel
    1.10 -  // and they are causing failures. When we resolve said race
    1.11 -  // conditions, we'll revert back to parallel remembered set
    1.12 -  // updating and scanning. See CRs 6677707 and 6677708.
    1.13 -  if (G1UseParallelRSetUpdating || (worker_i == 0)) {
    1.14 -    updateRS(&into_cset_dcq, worker_i);
    1.15 -  } else {
    1.16 -    _g1p->phase_times()->record_update_rs_processed_buffers(worker_i, 0);
    1.17 -    _g1p->phase_times()->record_update_rs_time(worker_i, 0.0);
    1.18 -  }
    1.19 -  if (G1UseParallelRSetScanning || (worker_i == 0)) {
    1.20 -    scanRS(oc, code_root_cl, worker_i);
    1.21 -  } else {
    1.22 -    _g1p->phase_times()->record_scan_rs_time(worker_i, 0.0);
    1.23 -  }
    1.24 +  updateRS(&into_cset_dcq, worker_i);
    1.25 +  scanRS(oc, code_root_cl, worker_i);
    1.26  
    1.27    // We now clear the cached values of _cset_rs_update_cl for this worker
    1.28    _cset_rs_update_cl[worker_i] = NULL;

     2.1 --- a/src/share/vm/gc_implementation/g1/g1_globals.hpp	Mon Dec 08 18:57:33 2014 +0100
     2.2 +++ b/src/share/vm/gc_implementation/g1/g1_globals.hpp	Thu Aug 07 09:35:08 2014 +0200
     2.3 @@ -217,14 +217,6 @@
     2.4    product(uintx, G1HeapRegionSize, 0,                                       \
     2.5            "Size of the G1 regions.")                                        \
     2.6                                                                              \
     2.7 -  experimental(bool, G1UseParallelRSetUpdating, true,                       \
     2.8 -          "Enables the parallelization of remembered set updating "         \
     2.9 -          "during evacuation pauses")                                       \
    2.10 -                                                                            \
    2.11 -  experimental(bool, G1UseParallelRSetScanning, true,                       \
    2.12 -          "Enables the parallelization of remembered set scanning "         \
    2.13 -          "during evacuation pauses")                                       \
    2.14 -                                                                            \
    2.15    product(uintx, G1ConcRefinementThreads, 0,                                \
    2.16            "If non-0 is the number of parallel rem set update threads, "     \
    2.17            "otherwise the value is determined ergonomically.")               \