src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp

rev 4802 : imported patch optimize-nmethod-scanning

*** 159,168 ****
--- 159,170 ----
    _last_ext_root_scan_times_ms(_max_gc_threads, "%.1lf"),
    _last_satb_filtering_times_ms(_max_gc_threads, "%.1lf"),
    _last_update_rs_times_ms(_max_gc_threads, "%.1lf"),
    _last_update_rs_processed_buffers(_max_gc_threads, "%d"),
    _last_scan_rs_times_ms(_max_gc_threads, "%.1lf"),
+   _last_strong_code_root_scan_times_ms(_max_gc_threads, "%.1lf"),
+   _last_strong_code_root_mark_times_ms(_max_gc_threads, "%.1lf"),
    _last_obj_copy_times_ms(_max_gc_threads, "%.1lf"),
    _last_termination_times_ms(_max_gc_threads, "%.1lf"),
    _last_termination_attempts(_max_gc_threads, SIZE_FORMAT),
    _last_gc_worker_end_times_ms(_max_gc_threads, "%.1lf", false),
    _last_gc_worker_times_ms(_max_gc_threads, "%.1lf"),
*** 180,189 ****
--- 182,193 ----
    _last_ext_root_scan_times_ms.reset();
    _last_satb_filtering_times_ms.reset();
    _last_update_rs_times_ms.reset();
    _last_update_rs_processed_buffers.reset();
    _last_scan_rs_times_ms.reset();
+   _last_strong_code_root_scan_times_ms.reset();
+   _last_strong_code_root_mark_times_ms.reset();
    _last_obj_copy_times_ms.reset();
    _last_termination_times_ms.reset();
    _last_termination_attempts.reset();
    _last_gc_worker_end_times_ms.reset();
    _last_gc_worker_times_ms.reset();
*** 195,204 ****
--- 199,210 ----
    _last_ext_root_scan_times_ms.verify();
    _last_satb_filtering_times_ms.verify();
    _last_update_rs_times_ms.verify();
    _last_update_rs_processed_buffers.verify();
    _last_scan_rs_times_ms.verify();
+   _last_strong_code_root_scan_times_ms.verify();
+   _last_strong_code_root_mark_times_ms.verify();
    _last_obj_copy_times_ms.verify();
    _last_termination_times_ms.verify();
    _last_termination_attempts.verify();
    _last_gc_worker_end_times_ms.verify();
  
*** 208,217 ****
--- 214,225 ----
  
      double worker_known_time = _last_ext_root_scan_times_ms.get(i) +
                                 _last_satb_filtering_times_ms.get(i) +
                                 _last_update_rs_times_ms.get(i) +
                                 _last_scan_rs_times_ms.get(i) +
+                                _last_strong_code_root_scan_times_ms.get(i) +
+                                _last_strong_code_root_mark_times_ms.get(i) +
                                 _last_obj_copy_times_ms.get(i) +
                                 _last_termination_times_ms.get(i);
  
      double worker_other_time = worker_time - worker_known_time;
      _last_gc_worker_other_times_ms.set(i, worker_other_time);
*** 237,246 ****
--- 245,257 ----
      misc_time_ms += _cur_collection_par_time_ms;
  
      // Now subtract the time taken to fix up roots in generated code
      misc_time_ms += _cur_collection_code_root_fixup_time_ms;
  
+     // Strong code root migration time
+     misc_time_ms += _cur_strong_code_root_migration_time_ms;
+ 
      // Subtract the time taken to clean the card table from the
      // current value of "other time"
      misc_time_ms += _cur_clear_ct_time_ms;
  
      return misc_time_ms;
*** 255,267 ****
--- 266,282 ----
      _last_gc_worker_start_times_ms.print(2, "GC Worker Start (ms)");
      _last_ext_root_scan_times_ms.print(2, "Ext Root Scanning (ms)");
      if (_last_satb_filtering_times_ms.sum() > 0.0) {
        _last_satb_filtering_times_ms.print(2, "SATB Filtering (ms)");
      }
+     if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
+      _last_strong_code_root_mark_times_ms.print(2, "Code Root Marking (ms)");
+     }
      _last_update_rs_times_ms.print(2, "Update RS (ms)");
        _last_update_rs_processed_buffers.print(3, "Processed Buffers");
      _last_scan_rs_times_ms.print(2, "Scan RS (ms)");
+     _last_strong_code_root_scan_times_ms.print(2, "Code Root Scanning (ms)");
      _last_obj_copy_times_ms.print(2, "Object Copy (ms)");
      _last_termination_times_ms.print(2, "Termination (ms)");
      if (G1Log::finest()) {
        _last_termination_attempts.print(3, "Termination Attempts");
      }
*** 271,286 ****
--- 286,306 ----
    } else {
      _last_ext_root_scan_times_ms.print(1, "Ext Root Scanning (ms)");
      if (_last_satb_filtering_times_ms.sum() > 0.0) {
        _last_satb_filtering_times_ms.print(1, "SATB Filtering (ms)");
      }
+     if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
+       _last_strong_code_root_mark_times_ms.print(1, "Code Root Marking (ms)");
+     }
      _last_update_rs_times_ms.print(1, "Update RS (ms)");
        _last_update_rs_processed_buffers.print(2, "Processed Buffers");
      _last_scan_rs_times_ms.print(1, "Scan RS (ms)");
+     _last_strong_code_root_scan_times_ms.print(1, "Code Root Scanning (ms)");
      _last_obj_copy_times_ms.print(1, "Object Copy (ms)");
    }
    print_stats(1, "Code Root Fixup", _cur_collection_code_root_fixup_time_ms);
+   print_stats(1, "Code Root Migration", _cur_strong_code_root_migration_time_ms);
    print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
    double misc_time_ms = pause_time_sec * MILLIUNITS - accounted_time_ms();
    print_stats(1, "Other", misc_time_ms);
    if (_cur_verify_before_time_ms > 0.0) {
      print_stats(2, "Verify Before", _cur_verify_before_time_ms);