comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @ 607:d8c7fa77a6dc

Merge
author kvn
date Tue, 03 Mar 2009 10:34:22 -0800
parents 3698e8f47799 98cb887364d3
children bcedf688d882
comparison
equal deleted inserted replaced
598:1fa16c3565be 607:d8c7fa77a6dc
2511 if (g1_policy()->should_initiate_conc_mark()) { 2511 if (g1_policy()->should_initiate_conc_mark()) {
2512 concurrent_mark()->checkpointRootsInitialPre(); 2512 concurrent_mark()->checkpointRootsInitialPre();
2513 } 2513 }
2514 save_marks(); 2514 save_marks();
2515 2515
2516 // We must do this before any possible evacuation that should propogate 2516 // We must do this before any possible evacuation that should propagate
2517 // marks, including evacuation of popular objects in a popular pause. 2517 // marks, including evacuation of popular objects in a popular pause.
2518 if (mark_in_progress()) { 2518 if (mark_in_progress()) {
2519 double start_time_sec = os::elapsedTime(); 2519 double start_time_sec = os::elapsedTime();
2520 2520
2521 _cm->drainAllSATBBuffers(); 2521 _cm->drainAllSATBBuffers();