src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp

rev 8068 : imported patch parallelscavenge_cleanup

*** 46,56 ****
  //
  // ThreadRootsMarkingTask
  //
  
  void ThreadRootsMarkingTask::do_it(GCTaskManager* manager, uint which) {
!   assert(Universe::heap()->is_gc_active(), "called outside gc");
  
    ResourceMark rm;
  
    NOT_PRODUCT(GCTraceTime tm("ThreadRootsMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
--- 46,56 ----
  //
  // ThreadRootsMarkingTask
  //
  
  void ThreadRootsMarkingTask::do_it(GCTaskManager* manager, uint which) {
!   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    ResourceMark rm;
  
    NOT_PRODUCT(GCTraceTime tm("ThreadRootsMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
*** 77,87 ****
    cm->follow_marking_stacks();
  }
  
  
  void MarkFromRootsTask::do_it(GCTaskManager* manager, uint which) {
!   assert(Universe::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("MarkFromRootsTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
--- 77,87 ----
    cm->follow_marking_stacks();
  }
  
  
  void MarkFromRootsTask::do_it(GCTaskManager* manager, uint which) {
!   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("MarkFromRootsTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
*** 148,158 ****
  // RefProcTaskProxy
  //
  
  void RefProcTaskProxy::do_it(GCTaskManager* manager, uint which)
  {
!   assert(Universe::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("RefProcTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
--- 148,158 ----
  // RefProcTaskProxy
  //
  
  void RefProcTaskProxy::do_it(GCTaskManager* manager, uint which)
  {
!   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("RefProcTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
*** 166,176 ****
  // RefProcTaskExecutor
  //
  
  void RefProcTaskExecutor::execute(ProcessTask& task)
  {
!   ParallelScavengeHeap* heap = PSParallelCompact::gc_heap();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    uint active_gc_threads = heap->gc_task_manager()->active_workers();
    RegionTaskQueueSet* qset = ParCompactionManager::region_array();
    ParallelTaskTerminator terminator(active_gc_threads, qset);
    GCTaskQueue* q = GCTaskQueue::create();
--- 166,176 ----
  // RefProcTaskExecutor
  //
  
  void RefProcTaskExecutor::execute(ProcessTask& task)
  {
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    uint active_gc_threads = heap->gc_task_manager()->active_workers();
    RegionTaskQueueSet* qset = ParCompactionManager::region_array();
    ParallelTaskTerminator terminator(active_gc_threads, qset);
    GCTaskQueue* q = GCTaskQueue::create();
*** 187,197 ****
    PSParallelCompact::gc_task_manager()->execute_and_wait(q);
  }
  
  void RefProcTaskExecutor::execute(EnqueueTask& task)
  {
!   ParallelScavengeHeap* heap = PSParallelCompact::gc_heap();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    GCTaskQueue* q = GCTaskQueue::create();
    for(uint i=0; i<parallel_gc_threads; i++) {
      q->enqueue(new RefEnqueueTaskProxy(task, i));
    }
--- 187,197 ----
    PSParallelCompact::gc_task_manager()->execute_and_wait(q);
  }
  
  void RefProcTaskExecutor::execute(EnqueueTask& task)
  {
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    GCTaskQueue* q = GCTaskQueue::create();
    for(uint i=0; i<parallel_gc_threads; i++) {
      q->enqueue(new RefEnqueueTaskProxy(task, i));
    }
*** 204,214 ****
  
  StealMarkingTask::StealMarkingTask(ParallelTaskTerminator* t) :
    _terminator(t) {}
  
  void StealMarkingTask::do_it(GCTaskManager* manager, uint which) {
!   assert(Universe::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("StealMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
--- 204,214 ----
  
  StealMarkingTask::StealMarkingTask(ParallelTaskTerminator* t) :
    _terminator(t) {}
  
  void StealMarkingTask::do_it(GCTaskManager* manager, uint which) {
!   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("StealMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
*** 236,246 ****
  
  StealRegionCompactionTask::StealRegionCompactionTask(ParallelTaskTerminator* t):
    _terminator(t) {}
  
  void StealRegionCompactionTask::do_it(GCTaskManager* manager, uint which) {
!   assert(Universe::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("StealRegionCompactionTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
--- 236,246 ----
  
  StealRegionCompactionTask::StealRegionCompactionTask(ParallelTaskTerminator* t):
    _terminator(t) {}
  
  void StealRegionCompactionTask::do_it(GCTaskManager* manager, uint which) {
!   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("StealRegionCompactionTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
*** 318,328 ****
                                                           _region_index_start,
                                                           _region_index_end);
  }
  
  void DrainStacksCompactionTask::do_it(GCTaskManager* manager, uint which) {
!   assert(Universe::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("DrainStacksCompactionTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
--- 318,328 ----
                                                           _region_index_start,
                                                           _region_index_end);
  }
  
  void DrainStacksCompactionTask::do_it(GCTaskManager* manager, uint which) {
!   assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    NOT_PRODUCT(GCTraceTime tm("DrainStacksCompactionTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =