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

rev 13241 : imported patch 8183128-erikd-review

*** 24,46 ****
  
  #include "precompiled.hpp"
  #include "gc/g1/concurrentG1Refine.hpp"
  #include "gc/g1/concurrentG1RefineThread.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/suspendibleThreadSet.hpp"
  #include "logging/log.hpp"
  #include "memory/resourceArea.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  
  ConcurrentG1RefineThread::
  ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread *next,
-                          CardTableEntryClosure* refine_closure,
                           uint worker_id_offset, uint worker_id,
                           size_t activate, size_t deactivate) :
    ConcurrentGCThread(),
-   _refine_closure(refine_closure),
    _worker_id_offset(worker_id_offset),
    _worker_id(worker_id),
    _active(false),
    _next(next),
    _monitor(NULL),
--- 24,45 ----
  
  #include "precompiled.hpp"
  #include "gc/g1/concurrentG1Refine.hpp"
  #include "gc/g1/concurrentG1RefineThread.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
+ #include "gc/g1/g1RemSet.hpp"
  #include "gc/g1/suspendibleThreadSet.hpp"
  #include "logging/log.hpp"
  #include "memory/resourceArea.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  
  ConcurrentG1RefineThread::
  ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread *next,
                           uint worker_id_offset, uint worker_id,
                           size_t activate, size_t deactivate) :
    ConcurrentGCThread(),
    _worker_id_offset(worker_id_offset),
    _worker_id(worker_id),
    _active(false),
    _next(next),
    _monitor(NULL),
*** 143,156 ****
              (curr_buffer_num > _next->_activation_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.
          }
          ++buffers_processed;
        }
      }
--- 142,152 ----
              (curr_buffer_num > _next->_activation_threshold)) {
            _next->activate();
          }
  
          // Process the next buffer, if there are enough left.
!         if (!dcqs.refine_completed_buffer_concurrently(_worker_id + _worker_id_offset, _deactivation_threshold)) {
            break; // Deactivate, number of buffers fell below threshold.
          }
          ++buffers_processed;
        }
      }