521 // the updating and scanning of remembered sets. There are some |
521 // the updating and scanning of remembered sets. There are some |
522 // race conditions when these two operations are done in parallel |
522 // race conditions when these two operations are done in parallel |
523 // and they are causing failures. When we resolve said race |
523 // and they are causing failures. When we resolve said race |
524 // conditions, we'll revert back to parallel remembered set |
524 // conditions, we'll revert back to parallel remembered set |
525 // updating and scanning. See CRs 6677707 and 6677708. |
525 // updating and scanning. See CRs 6677707 and 6677708. |
526 if (G1EnableParallelRSetUpdating || (worker_i == 0)) { |
526 if (G1ParallelRSetUpdatingEnabled || (worker_i == 0)) { |
527 updateRS(worker_i); |
527 updateRS(worker_i); |
528 scanNewRefsRS(oc, worker_i); |
528 scanNewRefsRS(oc, worker_i); |
529 } else { |
529 } else { |
530 _g1p->record_update_rs_start_time(worker_i, os::elapsedTime()); |
530 _g1p->record_update_rs_start_time(worker_i, os::elapsedTime()); |
531 _g1p->record_update_rs_processed_buffers(worker_i, 0.0); |
531 _g1p->record_update_rs_processed_buffers(worker_i, 0.0); |
532 _g1p->record_update_rs_time(worker_i, 0.0); |
532 _g1p->record_update_rs_time(worker_i, 0.0); |
533 _g1p->record_scan_new_refs_time(worker_i, 0.0); |
533 _g1p->record_scan_new_refs_time(worker_i, 0.0); |
534 } |
534 } |
535 if (G1EnableParallelRSetScanning || (worker_i == 0)) { |
535 if (G1ParallelRSetScanningEnabled || (worker_i == 0)) { |
536 scanRS(oc, worker_i); |
536 scanRS(oc, worker_i); |
537 } else { |
537 } else { |
538 _g1p->record_scan_rs_start_time(worker_i, os::elapsedTime()); |
538 _g1p->record_scan_rs_start_time(worker_i, os::elapsedTime()); |
539 _g1p->record_scan_rs_time(worker_i, 0.0); |
539 _g1p->record_scan_rs_time(worker_i, 0.0); |
540 } |
540 } |