src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp

rev 60060 : [mq]: 8210462-lkorinth-review

*** 191,208 ****
  #ifndef PRODUCT
  // Support for G1EvacuationFailureALot
  
  inline bool
  G1CollectedHeap::evacuation_failure_alot_for_gc_type(bool for_young_gc,
!                                                      bool during_initial_mark,
                                                       bool mark_or_rebuild_in_progress) {
    bool res = false;
    if (mark_or_rebuild_in_progress) {
      res |= G1EvacuationFailureALotDuringConcMark;
    }
!   if (during_initial_mark) {
!     res |= G1EvacuationFailureALotDuringInitialMark;
    }
    if (for_young_gc) {
      res |= G1EvacuationFailureALotDuringYoungGC;
    } else {
      // GCs are mixed
--- 191,208 ----
  #ifndef PRODUCT
  // Support for G1EvacuationFailureALot
  
  inline bool
  G1CollectedHeap::evacuation_failure_alot_for_gc_type(bool for_young_gc,
!                                                      bool during_concurrent_start,
                                                       bool mark_or_rebuild_in_progress) {
    bool res = false;
    if (mark_or_rebuild_in_progress) {
      res |= G1EvacuationFailureALotDuringConcMark;
    }
!   if (during_concurrent_start) {
!     res |= G1EvacuationFailureALotDuringConcurrentStart;
    }
    if (for_young_gc) {
      res |= G1EvacuationFailureALotDuringYoungGC;
    } else {
      // GCs are mixed
*** 225,240 ****
  
      _evacuation_failure_alot_for_current_gc = (elapsed_gcs >= G1EvacuationFailureALotInterval);
  
      // Now check if G1EvacuationFailureALot is enabled for the current GC type.
      const bool in_young_only_phase = collector_state()->in_young_only_phase();
!     const bool in_initial_mark_gc = collector_state()->in_initial_mark_gc();
      const bool mark_or_rebuild_in_progress = collector_state()->mark_or_rebuild_in_progress();
  
      _evacuation_failure_alot_for_current_gc &=
        evacuation_failure_alot_for_gc_type(in_young_only_phase,
!                                           in_initial_mark_gc,
                                            mark_or_rebuild_in_progress);
    }
  }
  
  inline bool G1CollectedHeap::evacuation_should_fail() {
--- 225,240 ----
  
      _evacuation_failure_alot_for_current_gc = (elapsed_gcs >= G1EvacuationFailureALotInterval);
  
      // Now check if G1EvacuationFailureALot is enabled for the current GC type.
      const bool in_young_only_phase = collector_state()->in_young_only_phase();
!     const bool in_concurrent_start_gc = collector_state()->in_concurrent_start_gc();
      const bool mark_or_rebuild_in_progress = collector_state()->mark_or_rebuild_in_progress();
  
      _evacuation_failure_alot_for_current_gc &=
        evacuation_failure_alot_for_gc_type(in_young_only_phase,
!                                           in_concurrent_start_gc,
                                            mark_or_rebuild_in_progress);
    }
  }
  
  inline bool G1CollectedHeap::evacuation_should_fail() {