src/share/vm/gc_implementation/g1/concurrentMark.cpp

*** 2139,2163 ****
  
    G1CMIsAliveClosure   g1_is_alive(g1h);
    G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap());
    G1CMDrainMarkingStackClosure
      g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive);
- 
    // We use the work gang from the G1CollectedHeap and we utilize all
    // the worker threads.
!   int active_workers = MAX2(MIN2(g1h->workers()->total_workers(), (int)_max_task_num), 1);
  
    G1RefProcTaskExecutor par_task_executor(g1h, this, nextMarkBitMap(),
                                            g1h->workers(), active_workers);
  
    if (rp->processing_is_mt()) {
      // Set the degree of MT here.  If the discovery is done MT, there
      // may have been a different number of threads doing the discovery
      // and a different number of discovered lists may have Ref objects.
      // That is OK as long as the Reference lists are balanced (see
      // balance_all_queues() and balance_queues()).
!     rp->set_mt_degree(active_workers);
  
      rp->process_discovered_references(&g1_is_alive,
                                        &g1_keep_alive,
                                        &g1_drain_mark_stack,
                                        &par_task_executor);
--- 2139,2164 ----
  
    G1CMIsAliveClosure   g1_is_alive(g1h);
    G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap());
    G1CMDrainMarkingStackClosure
      g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive);
    // We use the work gang from the G1CollectedHeap and we utilize all
    // the worker threads.
!   int active_workers = g1h->workers() ? g1h->workers()->total_workers() : 1;
!   active_workers = MAX2(MIN2(active_workers, (int)_max_task_num), 1);
  
    G1RefProcTaskExecutor par_task_executor(g1h, this, nextMarkBitMap(),
                                            g1h->workers(), active_workers);
  
+ 
    if (rp->processing_is_mt()) {
      // Set the degree of MT here.  If the discovery is done MT, there
      // may have been a different number of threads doing the discovery
      // and a different number of discovered lists may have Ref objects.
      // That is OK as long as the Reference lists are balanced (see
      // balance_all_queues() and balance_queues()).
!     rp->set_active_mt_degree(active_workers);
  
      rp->process_discovered_references(&g1_is_alive,
                                        &g1_keep_alive,
                                        &g1_drain_mark_stack,
                                        &par_task_executor);