Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Oct 23 11:43:29 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Mar 26 13:19:32 2015 +0100
     1.3 @@ -1084,7 +1084,7 @@
     1.4    if (update_stats) {
     1.5      double cost_per_card_ms = 0.0;
     1.6      if (_pending_cards > 0) {
     1.7 -      cost_per_card_ms = phase_times()->average_last_update_rs_time() / (double) _pending_cards;
     1.8 +      cost_per_card_ms = phase_times()->average_time_ms(G1GCPhaseTimes::UpdateRS) / (double) _pending_cards;
     1.9        _cost_per_card_ms_seq->add(cost_per_card_ms);
    1.10      }
    1.11  
    1.12 @@ -1092,7 +1092,7 @@
    1.13  
    1.14      double cost_per_entry_ms = 0.0;
    1.15      if (cards_scanned > 10) {
    1.16 -      cost_per_entry_ms = phase_times()->average_last_scan_rs_time() / (double) cards_scanned;
    1.17 +      cost_per_entry_ms = phase_times()->average_time_ms(G1GCPhaseTimes::ScanRS) / (double) cards_scanned;
    1.18        if (_last_gc_was_young) {
    1.19          _cost_per_entry_ms_seq->add(cost_per_entry_ms);
    1.20        } else {
    1.21 @@ -1134,7 +1134,7 @@
    1.22      double cost_per_byte_ms = 0.0;
    1.23  
    1.24      if (copied_bytes > 0) {
    1.25 -      cost_per_byte_ms = phase_times()->average_last_obj_copy_time() / (double) copied_bytes;
    1.26 +      cost_per_byte_ms = phase_times()->average_time_ms(G1GCPhaseTimes::ObjCopy) / (double) copied_bytes;
    1.27        if (_in_marking_window) {
    1.28          _cost_per_byte_ms_during_cm_seq->add(cost_per_byte_ms);
    1.29        } else {
    1.30 @@ -1143,8 +1143,8 @@
    1.31      }
    1.32  
    1.33      double all_other_time_ms = pause_time_ms -
    1.34 -      (phase_times()->average_last_update_rs_time() + phase_times()->average_last_scan_rs_time()
    1.35 -      + phase_times()->average_last_obj_copy_time() + phase_times()->average_last_termination_time());
    1.36 +      (phase_times()->average_time_ms(G1GCPhaseTimes::UpdateRS) + phase_times()->average_time_ms(G1GCPhaseTimes::ScanRS) +
    1.37 +          phase_times()->average_time_ms(G1GCPhaseTimes::ObjCopy) + phase_times()->average_time_ms(G1GCPhaseTimes::Termination));
    1.38  
    1.39      double young_other_time_ms = 0.0;
    1.40      if (young_cset_region_length() > 0) {
    1.41 @@ -1185,8 +1185,8 @@
    1.42  
    1.43    // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
    1.44    double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
    1.45 -  adjust_concurrent_refinement(phase_times()->average_last_update_rs_time(),
    1.46 -                               phase_times()->sum_last_update_rs_processed_buffers(), update_rs_time_goal_ms);
    1.47 +  adjust_concurrent_refinement(phase_times()->average_time_ms(G1GCPhaseTimes::UpdateRS),
    1.48 +                               phase_times()->sum_thread_work_items(G1GCPhaseTimes::UpdateRS), update_rs_time_goal_ms);
    1.49  
    1.50    _collectionSetChooser->verify();
    1.51  }
    1.52 @@ -2189,19 +2189,19 @@
    1.53      _other.add(pause_time_ms - phase_times->accounted_time_ms());
    1.54      _root_region_scan_wait.add(phase_times->root_region_scan_wait_time_ms());
    1.55      _parallel.add(phase_times->cur_collection_par_time_ms());
    1.56 -    _ext_root_scan.add(phase_times->average_last_ext_root_scan_time());
    1.57 -    _satb_filtering.add(phase_times->average_last_satb_filtering_times_ms());
    1.58 -    _update_rs.add(phase_times->average_last_update_rs_time());
    1.59 -    _scan_rs.add(phase_times->average_last_scan_rs_time());
    1.60 -    _obj_copy.add(phase_times->average_last_obj_copy_time());
    1.61 -    _termination.add(phase_times->average_last_termination_time());
    1.62 +    _ext_root_scan.add(phase_times->average_time_ms(G1GCPhaseTimes::ExtRootScan));
    1.63 +    _satb_filtering.add(phase_times->average_time_ms(G1GCPhaseTimes::SATBFiltering));
    1.64 +    _update_rs.add(phase_times->average_time_ms(G1GCPhaseTimes::UpdateRS));
    1.65 +    _scan_rs.add(phase_times->average_time_ms(G1GCPhaseTimes::ScanRS));
    1.66 +    _obj_copy.add(phase_times->average_time_ms(G1GCPhaseTimes::ObjCopy));
    1.67 +    _termination.add(phase_times->average_time_ms(G1GCPhaseTimes::Termination));
    1.68  
    1.69 -    double parallel_known_time = phase_times->average_last_ext_root_scan_time() +
    1.70 -      phase_times->average_last_satb_filtering_times_ms() +
    1.71 -      phase_times->average_last_update_rs_time() +
    1.72 -      phase_times->average_last_scan_rs_time() +
    1.73 -      phase_times->average_last_obj_copy_time() +
    1.74 -      + phase_times->average_last_termination_time();
    1.75 +    double parallel_known_time = phase_times->average_time_ms(G1GCPhaseTimes::ExtRootScan) +
    1.76 +      phase_times->average_time_ms(G1GCPhaseTimes::SATBFiltering) +
    1.77 +      phase_times->average_time_ms(G1GCPhaseTimes::UpdateRS) +
    1.78 +      phase_times->average_time_ms(G1GCPhaseTimes::ScanRS) +
    1.79 +      phase_times->average_time_ms(G1GCPhaseTimes::ObjCopy) +
    1.80 +      phase_times->average_time_ms(G1GCPhaseTimes::Termination);
    1.81  
    1.82      double parallel_other_time = phase_times->cur_collection_par_time_ms() - parallel_known_time;
    1.83      _parallel_other.add(parallel_other_time);