src/share/vm/gc/g1/g1GCPhaseTimes.cpp

*** 104,114 ****
        _gc_par_phases[i]->reset();
      }
    }
  }
  
! #define ASSERT_PHASE_UNINITILIAZED(phase) \
      assert(_gc_par_phases[phase]->get(i) == uninitialized, "Phase " #phase " reported for thread that was not started");
  
  double G1GCPhaseTimes::worker_time(GCParPhases phase, uint worker) {
    double value = _gc_par_phases[phase]->get(worker);
    if (value != WorkerDataArray<double>::uninitialized()) {
--- 104,114 ----
        _gc_par_phases[i]->reset();
      }
    }
  }
  
! #define ASSERT_PHASE_UNINITIALIZED(phase) \
      assert(_gc_par_phases[phase]->get(i) == uninitialized, "Phase " #phase " reported for thread that was not started");
  
  double G1GCPhaseTimes::worker_time(GCParPhases phase, uint worker) {
    double value = _gc_par_phases[phase]->get(worker);
    if (value != WorkerDataArray<double>::uninitialized()) {
*** 139,161 ****
            + worker_time(Termination, i);
  
        record_time_secs(Other, i, total_worker_time - worker_known_time);
      } else {
        // Make sure all slots are uninitialized since this thread did not seem to have been started
!       ASSERT_PHASE_UNINITILIAZED(GCWorkerEnd);
!       ASSERT_PHASE_UNINITILIAZED(ExtRootScan);
!       ASSERT_PHASE_UNINITILIAZED(SATBFiltering);
!       ASSERT_PHASE_UNINITILIAZED(UpdateRS);
!       ASSERT_PHASE_UNINITILIAZED(ScanRS);
!       ASSERT_PHASE_UNINITILIAZED(CodeRoots);
!       ASSERT_PHASE_UNINITILIAZED(ObjCopy);
!       ASSERT_PHASE_UNINITILIAZED(Termination);
      }
    }
  }
  
! #undef ASSERT_PHASE_UNINITILIAZED
  
  // record the time a phase took in seconds
  void G1GCPhaseTimes::record_time_secs(GCParPhases phase, uint worker_i, double secs) {
    _gc_par_phases[phase]->set(worker_i, secs);
  }
--- 139,161 ----
            + worker_time(Termination, i);
  
        record_time_secs(Other, i, total_worker_time - worker_known_time);
      } else {
        // Make sure all slots are uninitialized since this thread did not seem to have been started
!       ASSERT_PHASE_UNINITIALIZED(GCWorkerEnd);
!       ASSERT_PHASE_UNINITIALIZED(ExtRootScan);
!       ASSERT_PHASE_UNINITIALIZED(SATBFiltering);
!       ASSERT_PHASE_UNINITIALIZED(UpdateRS);
!       ASSERT_PHASE_UNINITIALIZED(ScanRS);
!       ASSERT_PHASE_UNINITIALIZED(CodeRoots);
!       ASSERT_PHASE_UNINITIALIZED(ObjCopy);
!       ASSERT_PHASE_UNINITIALIZED(Termination);
      }
    }
  }
  
! #undef ASSERT_PHASE_UNINITIALIZED
  
  // record the time a phase took in seconds
  void G1GCPhaseTimes::record_time_secs(GCParPhases phase, uint worker_i, double secs) {
    _gc_par_phases[phase]->set(worker_i, secs);
  }