src/hotspot/share/gc/parallel/psParallelCompact.cpp

*** 2098,2108 ****
  
    ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    uint active_gc_threads = heap->gc_task_manager()->active_workers();
    TaskQueueSetSuper* qset = ParCompactionManager::stack_array();
!   ParallelTaskTerminator terminator(active_gc_threads, qset);
  
    PCMarkAndPushClosure mark_and_push_closure(cm);
    ParCompactionManager::FollowStackClosure follow_stack_closure(cm);
  
    // Need new claim bits before marking starts.
--- 2098,2108 ----
  
    ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    uint active_gc_threads = heap->gc_task_manager()->active_workers();
    TaskQueueSetSuper* qset = ParCompactionManager::stack_array();
!   TaskTerminator terminator(active_gc_threads, qset);
  
    PCMarkAndPushClosure mark_and_push_closure(cm);
    ParCompactionManager::FollowStackClosure follow_stack_closure(cm);
  
    // Need new claim bits before marking starts.
*** 2127,2137 ****
      q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::jvmti));
      q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::code_cache));
  
      if (active_gc_threads > 1) {
        for (uint j = 0; j < active_gc_threads; j++) {
!         q->enqueue(new StealMarkingTask(&terminator));
        }
      }
  
      gc_task_manager()->execute_and_wait(q);
    }
--- 2127,2137 ----
      q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::jvmti));
      q->enqueue(new MarkFromRootsTask(MarkFromRootsTask::code_cache));
  
      if (active_gc_threads > 1) {
        for (uint j = 0; j < active_gc_threads; j++) {
!         q->enqueue(new StealMarkingTask(terminator.terminator()));
        }
      }
  
      gc_task_manager()->execute_and_wait(q);
    }
*** 2457,2472 ****
    PSOldGen* old_gen = heap->old_gen();
    old_gen->start_array()->reset();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    uint active_gc_threads = heap->gc_task_manager()->active_workers();
    TaskQueueSetSuper* qset = ParCompactionManager::region_array();
!   ParallelTaskTerminator terminator(active_gc_threads, qset);
  
    GCTaskQueue* q = GCTaskQueue::create();
    prepare_region_draining_tasks(q, active_gc_threads);
    enqueue_dense_prefix_tasks(q, active_gc_threads);
!   enqueue_region_stealing_tasks(q, &terminator, active_gc_threads);
  
    {
      GCTraceTime(Trace, gc, phases) tm("Par Compact", &_gc_timer);
  
      gc_task_manager()->execute_and_wait(q);
--- 2457,2472 ----
    PSOldGen* old_gen = heap->old_gen();
    old_gen->start_array()->reset();
    uint parallel_gc_threads = heap->gc_task_manager()->workers();
    uint active_gc_threads = heap->gc_task_manager()->active_workers();
    TaskQueueSetSuper* qset = ParCompactionManager::region_array();
!   TaskTerminator terminator(active_gc_threads, qset);
  
    GCTaskQueue* q = GCTaskQueue::create();
    prepare_region_draining_tasks(q, active_gc_threads);
    enqueue_dense_prefix_tasks(q, active_gc_threads);
!   enqueue_region_stealing_tasks(q, terminator.terminator(), active_gc_threads);
  
    {
      GCTraceTime(Trace, gc, phases) tm("Par Compact", &_gc_timer);
  
      gc_task_manager()->execute_and_wait(q);