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

rev 8151 : 6407976: GC worker number should be unsigned
Reviewed-by: jwilhelm

*** 1086,1098 ****
  }
  
  class RebuildRSOutOfRegionClosure: public HeapRegionClosure {
    G1CollectedHeap*   _g1h;
    UpdateRSOopClosure _cl;
!   int                _worker_i;
  public:
!   RebuildRSOutOfRegionClosure(G1CollectedHeap* g1, int worker_i = 0) :
      _cl(g1->g1_rem_set(), worker_i),
      _worker_i(worker_i),
      _g1h(g1)
    { }
  
--- 1086,1098 ----
  }
  
  class RebuildRSOutOfRegionClosure: public HeapRegionClosure {
    G1CollectedHeap*   _g1h;
    UpdateRSOopClosure _cl;
!   uint               _worker_i;
  public:
!   RebuildRSOutOfRegionClosure(G1CollectedHeap* g1, uint worker_i = 0) :
      _cl(g1->g1_rem_set(), worker_i),
      _worker_i(worker_i),
      _g1h(g1)
    { }
  
*** 3071,3081 ****
  
        G1ParVerifyTask task(this, vo);
        assert(UseDynamicNumberOfGCThreads ||
          workers()->active_workers() == workers()->total_workers(),
          "If not dynamic should be using all the workers");
!       int n_workers = workers()->active_workers();
        set_par_threads(n_workers);
        workers()->run_task(&task);
        set_par_threads(0);
        if (task.failures()) {
          failures = true;
--- 3071,3081 ----
  
        G1ParVerifyTask task(this, vo);
        assert(UseDynamicNumberOfGCThreads ||
          workers()->active_workers() == workers()->total_workers(),
          "If not dynamic should be using all the workers");
!       uint n_workers = workers()->active_workers();
        set_par_threads(n_workers);
        workers()->run_task(&task);
        set_par_threads(0);
        if (task.failures()) {
          failures = true;
*** 3609,3631 ****
  
  void G1CollectedHeap::print_taskqueue_stats(outputStream* const st) const {
    print_taskqueue_stats_hdr(st);
  
    TaskQueueStats totals;
!   const int n = workers()->total_workers();
!   for (int i = 0; i < n; ++i) {
      st->print("%3d ", i); task_queue(i)->stats.print(st); st->cr();
      totals += task_queue(i)->stats;
    }
    st->print_raw("tot "); totals.print(st); st->cr();
  
    DEBUG_ONLY(totals.verify());
  }
  
  void G1CollectedHeap::reset_taskqueue_stats() {
!   const int n = workers()->total_workers();
!   for (int i = 0; i < n; ++i) {
      task_queue(i)->stats.reset();
    }
  }
  #endif // TASKQUEUE_STATS
  
--- 3609,3631 ----
  
  void G1CollectedHeap::print_taskqueue_stats(outputStream* const st) const {
    print_taskqueue_stats_hdr(st);
  
    TaskQueueStats totals;
!   const uint n = workers()->total_workers();
!   for (uint i = 0; i < n; ++i) {
      st->print("%3d ", i); task_queue(i)->stats.print(st); st->cr();
      totals += task_queue(i)->stats;
    }
    st->print_raw("tot "); totals.print(st); st->cr();
  
    DEBUG_ONLY(totals.verify());
  }
  
  void G1CollectedHeap::reset_taskqueue_stats() {
!   const uint n = workers()->total_workers();
!   for (uint i = 0; i < n; ++i) {
      task_queue(i)->stats.reset();
    }
  }
  #endif // TASKQUEUE_STATS
  
*** 4368,4378 ****
      return queues()->queue(i);
    }
  
    ParallelTaskTerminator* terminator() { return &_terminator; }
  
!   virtual void set_for_termination(int active_workers) {
      _root_processor->set_num_workers(active_workers);
      terminator()->reset_for_reuse(active_workers);
      _n_workers = active_workers;
    }
  
--- 4368,4378 ----
      return queues()->queue(i);
    }
  
    ParallelTaskTerminator* terminator() { return &_terminator; }
  
!   virtual void set_for_termination(uint active_workers) {
      _root_processor->set_num_workers(active_workers);
      terminator()->reset_for_reuse(active_workers);
      _n_workers = active_workers;
    }
  
*** 5048,5064 ****
  class G1STWRefProcTaskExecutor: public AbstractRefProcTaskExecutor {
  private:
    G1CollectedHeap*   _g1h;
    RefToScanQueueSet* _queues;
    FlexibleWorkGang*  _workers;
!   int                _active_workers;
  
  public:
    G1STWRefProcTaskExecutor(G1CollectedHeap* g1h,
                          FlexibleWorkGang* workers,
                          RefToScanQueueSet *task_queues,
!                         int n_workers) :
      _g1h(g1h),
      _queues(task_queues),
      _workers(workers),
      _active_workers(n_workers)
    {
--- 5048,5064 ----
  class G1STWRefProcTaskExecutor: public AbstractRefProcTaskExecutor {
  private:
    G1CollectedHeap*   _g1h;
    RefToScanQueueSet* _queues;
    FlexibleWorkGang*  _workers;
!   uint               _active_workers;
  
  public:
    G1STWRefProcTaskExecutor(G1CollectedHeap* g1h,
                          FlexibleWorkGang* workers,
                          RefToScanQueueSet *task_queues,
!                         uint n_workers) :
      _g1h(g1h),
      _queues(task_queues),
      _workers(workers),
      _active_workers(n_workers)
    {
*** 5187,5197 ****
    RefToScanQueueSet      *_queues;
    ParallelTaskTerminator _terminator;
    uint _n_workers;
  
  public:
!   G1ParPreserveCMReferentsTask(G1CollectedHeap* g1h,int workers, RefToScanQueueSet *task_queues) :
      AbstractGangTask("ParPreserveCMReferents"),
      _g1h(g1h),
      _queues(task_queues),
      _terminator(workers, _queues),
      _n_workers(workers)
--- 5187,5197 ----
    RefToScanQueueSet      *_queues;
    ParallelTaskTerminator _terminator;
    uint _n_workers;
  
  public:
!   G1ParPreserveCMReferentsTask(G1CollectedHeap* g1h, uint workers, RefToScanQueueSet *task_queues) :
      AbstractGangTask("ParPreserveCMReferents"),
      _g1h(g1h),
      _queues(task_queues),
      _terminator(workers, _queues),
      _n_workers(workers)