src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 60421 : [mq]: 8248401-stefank-review

*** 1966,1976 ****
  
    _old_marking_cycles_started++;
  }
  
  void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent,
!                                                              bool liveness_completed) {
    MonitorLocker ml(G1OldGCCount_lock, Mutex::_no_safepoint_check_flag);
  
    // We assume that if concurrent == true, then the caller is a
    // concurrent thread that was joined the Suspendible Thread
    // Set. If there's ever a cheap way to check this, we should add an
--- 1966,1976 ----
  
    _old_marking_cycles_started++;
  }
  
  void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent,
!                                                              bool whole_heap_examined) {
    MonitorLocker ml(G1OldGCCount_lock, Mutex::_no_safepoint_check_flag);
  
    // We assume that if concurrent == true, then the caller is a
    // concurrent thread that was joined the Suspendible Thread
    // Set. If there's ever a cheap way to check this, we should add an
*** 1998,2008 ****
           "_old_marking_cycles_started = %u "
           "is inconsistent with _old_marking_cycles_completed = %u",
           _old_marking_cycles_started, _old_marking_cycles_completed);
  
    _old_marking_cycles_completed += 1;
!   if (liveness_completed) {
      next_whole_heap_examined();
    }
  
    // We need to clear the "in_progress" flag in the CM thread before
    // we wake up any waiters (especially when ExplicitInvokesConcurrent
--- 1998,2008 ----
           "_old_marking_cycles_started = %u "
           "is inconsistent with _old_marking_cycles_completed = %u",
           _old_marking_cycles_started, _old_marking_cycles_completed);
  
    _old_marking_cycles_completed += 1;
!   if (whole_heap_examined) {
      next_whole_heap_examined();
    }
  
    // We need to clear the "in_progress" flag in the CM thread before
    // we wake up any waiters (especially when ExplicitInvokesConcurrent