src/share/vm/gc/g1/concurrentG1RefineThread.cpp

rev 10596 : imported patch yield
rev 10597 : [mq]: yield_inc1

*** 74,84 ****
       MAX2(_threshold - MIN2(_threshold, cg1r()->thread_threshold_step()),
            cg1r()->green_zone());
  }
  
  void ConcurrentG1RefineThread::wait_for_completed_buffers() {
-   DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
    MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
    while (!should_terminate() && !is_active()) {
      _monitor->wait(Mutex::_no_safepoint_check_flag);
    }
  }
--- 74,83 ----
*** 124,134 ****
                            _worker_id, _threshold, dcqs.completed_buffers_num());
  
      {
        SuspendibleThreadSetJoiner sts_join;
  
!       do {
          size_t curr_buffer_num = dcqs.completed_buffers_num();
          // If the number of the buffers falls down into the yellow zone,
          // that means that the transition period after the evacuation pause has ended.
          if (dcqs.completed_queue_padding() > 0 && curr_buffer_num <= cg1r()->yellow_zone()) {
            dcqs.set_completed_queue_padding(0);
--- 123,138 ----
                            _worker_id, _threshold, dcqs.completed_buffers_num());
  
      {
        SuspendibleThreadSetJoiner sts_join;
  
!       while (!should_terminate()) {
!         if (sts_join.should_yield()) {
!           sts_join.yield();
!           continue;             // Re-check for termination after yield delay.
!         }
! 
          size_t curr_buffer_num = dcqs.completed_buffers_num();
          // If the number of the buffers falls down into the yellow zone,
          // that means that the transition period after the evacuation pause has ended.
          if (dcqs.completed_queue_padding() > 0 && curr_buffer_num <= cg1r()->yellow_zone()) {
            dcqs.set_completed_queue_padding(0);
*** 136,155 ****
  
          // Check if we need to activate the next thread.
          if (_next != NULL && !_next->is_active() && curr_buffer_num > _next->_threshold) {
            _next->activate();
          }
!       } while (dcqs.apply_closure_to_completed_buffer(_refine_closure,
                                                        _worker_id + _worker_id_offset,
                                                        _deactivation_threshold,
!                                                       false /* during_pause */));
  
        deactivate();
!       log_debug(gc, refine)("Deactivated %d, off threshold: " SIZE_FORMAT ", current: " SIZE_FORMAT,
                              _worker_id, _deactivation_threshold,
                              dcqs.completed_buffers_num());
-     }
  
      if (os::supports_vtime()) {
        _vtime_accum = (os::elapsedVTime() - _vtime_start);
      } else {
        _vtime_accum = 0.0;
--- 140,165 ----
  
          // Check if we need to activate the next thread.
          if (_next != NULL && !_next->is_active() && curr_buffer_num > _next->_threshold) {
            _next->activate();
          }
! 
!         // Process the next buffer, if there are enough left.
!         if (!dcqs.apply_closure_to_completed_buffer(_refine_closure,
                                                      _worker_id + _worker_id_offset,
                                                      _deactivation_threshold,
!                                                     false /* during_pause */)) {
!           break; // Deactivate, number of buffers fell below threshold.
!         }
!       }
!     }
  
      deactivate();
!     log_debug(gc, refine)("Deactivated %d, off threshold: " SIZE_FORMAT
!                           ", current: " SIZE_FORMAT,
                            _worker_id, _deactivation_threshold,
                            dcqs.completed_buffers_num());
  
      if (os::supports_vtime()) {
        _vtime_accum = (os::elapsedVTime() - _vtime_start);
      } else {
        _vtime_accum = 0.0;