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

changeset 2061
9d7a8ab3736b
parent 1993
b2a00dd3117c
child 2191
894b1d7c7e01
     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Mon Aug 02 12:51:43 2010 -0700
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Thu Jul 22 10:27:41 2010 -0400
     1.3 @@ -157,10 +157,8 @@
     1.4      q->enqueue(new PSRefProcTaskProxy(task, i));
     1.5    }
     1.6    ParallelTaskTerminator terminator(
     1.7 -    ParallelScavengeHeap::gc_task_manager()->workers(),
     1.8 -    UseDepthFirstScavengeOrder ?
     1.9 -        (TaskQueueSetSuper*) PSPromotionManager::stack_array_depth()
    1.10 -      : (TaskQueueSetSuper*) PSPromotionManager::stack_array_breadth());
    1.11 +                 ParallelScavengeHeap::gc_task_manager()->workers(),
    1.12 +                 (TaskQueueSetSuper*) PSPromotionManager::stack_array_depth());
    1.13    if (task.marks_oops_alive() && ParallelGCThreads > 1) {
    1.14      for (uint j=0; j<ParallelGCThreads; j++) {
    1.15        q->enqueue(new StealTask(&terminator));
    1.16 @@ -375,10 +373,8 @@
    1.17        q->enqueue(new ScavengeRootsTask(ScavengeRootsTask::code_cache));
    1.18  
    1.19        ParallelTaskTerminator terminator(
    1.20 -        gc_task_manager()->workers(),
    1.21 -        promotion_manager->depth_first() ?
    1.22 -            (TaskQueueSetSuper*) promotion_manager->stack_array_depth()
    1.23 -          : (TaskQueueSetSuper*) promotion_manager->stack_array_breadth());
    1.24 +                  gc_task_manager()->workers(),
    1.25 +                  (TaskQueueSetSuper*) promotion_manager->stack_array_depth());
    1.26        if (ParallelGCThreads>1) {
    1.27          for (uint j=0; j<ParallelGCThreads; j++) {
    1.28            q->enqueue(new StealTask(&terminator));

mercurial