stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8243848: Shenandoah: Windows build fails after JDK-8239786

Browse Source 
Reviewed-by: rkennke, stuefe
This commit is contained in:
Zhengyu Gu 2020-04-28 12:20:15 -04:00
parent b723b94614
commit 04ae3fd603
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View File

@ -372,7 +372,7 @@ jint ShenandoahHeap::initialize() {
}
_monitoring_support = new ShenandoahMonitoringSupport(this);
_phase_timings = new ShenandoahPhaseTimings();
_phase_timings = new ShenandoahPhaseTimings(max_workers());
ShenandoahStringDedup::initialize();
ShenandoahCodeRoots::initialize();

6
src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
View File

@ -47,8 +47,8 @@ const char* ShenandoahPhaseTimings::_phase_names[] = {
#undef GC_PHASE_DECLARE_NAME
ShenandoahPhaseTimings::ShenandoahPhaseTimings() {
_max_workers = MAX2(ConcGCThreads, ParallelGCThreads);
ShenandoahPhaseTimings::ShenandoahPhaseTimings(uint max_workers) :
_max_workers(max_workers) {
assert(_max_workers > 0, "Must have some GC threads");
// Initialize everything to sane defaults
@ -182,7 +182,7 @@ void ShenandoahPhaseTimings::print_cycle_on(outputStream* out) const {
out->print(SHENANDOAH_PHASE_NAME_FORMAT " " SHENANDOAH_US_TIME_FORMAT " us", _phase_names[i], v);
if (_worker_data[i] != NULL) {
out->print(", workers (us): ");
for (size_t c = 0; c < _max_workers; c++) {
for (uint c = 0; c < _max_workers; c++) {
double tv = _worker_data[i]->get(c);
if (tv != ShenandoahWorkerData::uninitialized()) {
out->print(SHENANDOAH_US_WORKER_TIME_FORMAT ", ", tv * 1000000.0);

4
src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
View File

@ -178,7 +178,7 @@ public:
#undef GC_PHASE_DECLARE_ENUM
private:
size_t _max_workers;
uint _max_workers;
double _cycle_data[_num_phases];
HdrSeq _global_data[_num_phases];
static const char* _phase_names[_num_phases];
@ -196,7 +196,7 @@ private:
void set_cycle_data(Phase phase, double time);
public:
ShenandoahPhaseTimings();
ShenandoahPhaseTimings(uint _max_workers);
void record_phase_time(Phase phase, double time);