*** old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Jul 19 10:34:06 2012
--- new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Jul 19 10:34:06 2012

*** 2273,2284 ****
--- 2273,2283 ----
    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
    int n_completed_buffers = 0;
    while (dcqs.apply_closure_to_completed_buffer(cl, worker_i, 0, true)) {
      n_completed_buffers++;
    }
!   g1_policy()->phase_times()->record_update_rs_processed_buffers(worker_i, n_completed_buffers);
                                                    (double) n_completed_buffers);
    dcqs.clear_n_completed_buffers();
    assert(!dcqs.completed_buffers_exist_dirty(), "Completed buffers exist!");
  }
  
  

*** 3883,3896 ****
--- 3882,3891 ----
                                   true  /* verify_enqueued_buffers */,
                                   true  /* verify_thread_buffers */,
                                   true  /* verify_fingers */);
          _cm->note_end_of_gc();
  
          // Collect thread local data to allow the ergonomics to use
          // the collected information
          g1_policy()->phase_times()->collapse_par_times();
  
          // This timing is only used by the ergonomics to handle our pause target.
          // It is unclear why this should not include the full pause. We will
          // investigate this in CR 7178365.
          double sample_end_time_sec = os::elapsedTime();
          double pause_time_ms = (sample_end_time_sec - sample_start_time_sec) * MILLIUNITS;

*** 4752,4762 ****
--- 4747,4757 ----
          double start = os::elapsedTime();
          G1ParEvacuateFollowersClosure evac(_g1h, &pss, _queues, &_terminator);
          evac.do_void();
          double elapsed_ms = (os::elapsedTime()-start)*1000.0;
          double term_ms = pss.term_time()*1000.0;
!         _g1h->g1_policy()->phase_times()->record_obj_copy_time(worker_id, elapsed_ms-term_ms);
!         _g1h->g1_policy()->phase_times()->add_obj_copy_time(worker_id, elapsed_ms-term_ms);
          _g1h->g1_policy()->phase_times()->record_termination(worker_id, term_ms, pss.term_attempts());
        }
        _g1h->g1_policy()->record_thread_age_table(pss.age_table());
        _g1h->update_surviving_young_words(pss.surviving_young_words()+1);
  

*** 4880,4910 ****
--- 4875,4906 ----
  
    // Finish up any enqueued closure apps (attributed as object copy time).
    buf_scan_non_heap_roots.done();
    buf_scan_perm.done();
  
    double ext_roots_end = os::elapsedTime();
  
    g1_policy()->phase_times()->reset_obj_copy_time(worker_i);
    double obj_copy_time_sec = buf_scan_perm.closure_app_seconds() +
                                  buf_scan_non_heap_roots.closure_app_seconds();
    g1_policy()->phase_times()->record_obj_copy_time(worker_i, obj_copy_time_sec * 1000.0);
  
    double ext_root_time_ms =
!     ((ext_roots_end - ext_roots_start) - obj_copy_time_sec) * 1000.0;
!     ((os::elapsedTime() - ext_roots_start) - obj_copy_time_sec) * 1000.0;
  
    g1_policy()->phase_times()->record_ext_root_scan_time(worker_i, ext_root_time_ms);
  
    // During conc marking we have to filter the per-thread SATB buffers
    // to make sure we remove any oops into the CSet (which will show up
    // as implicitly live).
+   double satb_filtering_ms = 0.0;
    if (!_process_strong_tasks->is_task_claimed(G1H_PS_filter_satb_buffers)) {
      if (mark_in_progress()) {
+       double satb_filter_start = os::elapsedTime();
+ 
        JavaThread::satb_mark_queue_set().filter_thread_buffers();
+ 
+       satb_filtering_ms = (os::elapsedTime() - satb_filter_start) * 1000.0;
      }
    }
    double satb_filtering_ms = (os::elapsedTime() - ext_roots_end) * 1000.0;
    g1_policy()->phase_times()->record_satb_filtering_time(worker_i, satb_filtering_ms);
  
    // Now scan the complement of the collection set.
    if (scan_rs != NULL) {
      g1_rem_set()->oops_into_collection_set_do(scan_rs, worker_i);