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

7147806: G1: Crash in vm bootstrap when running with -XX:+UseG1GC -XX:-UsePerfData

Browse Source 
Update generation and collector counters only if UsePerfData is enabled.

Reviewed-by: iveresov, tonyp
This commit is contained in:
John Cuthbertson 2012-03-02 10:36:16 -08:00
parent 27c0786c3b
commit 4bcab49b68
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,9 @@ G1YoungGenerationCounters::G1YoungGenerationCounters(G1MonitoringSupport* g1mm,
G1MonitoringSupport::pad_capacity(0, 3) /* min_capacity */, G1MonitoringSupport::pad_capacity(0, 3) /* min_capacity */,
G1MonitoringSupport::pad_capacity(g1mm->young_gen_max(), 3), G1MonitoringSupport::pad_capacity(g1mm->young_gen_max(), 3),
G1MonitoringSupport::pad_capacity(0, 3) /* curr_capacity */) { G1MonitoringSupport::pad_capacity(0, 3) /* curr_capacity */) {
update_all(); if (UsePerfData) {
update_all();
}
} }
G1OldGenerationCounters::G1OldGenerationCounters(G1MonitoringSupport* g1mm, G1OldGenerationCounters::G1OldGenerationCounters(G1MonitoringSupport* g1mm,
@ -53,7 +55,9 @@ G1OldGenerationCounters::G1OldGenerationCounters(G1MonitoringSupport* g1mm,
G1MonitoringSupport::pad_capacity(0) /* min_capacity */, G1MonitoringSupport::pad_capacity(0) /* min_capacity */,
G1MonitoringSupport::pad_capacity(g1mm->old_gen_max()), G1MonitoringSupport::pad_capacity(g1mm->old_gen_max()),
G1MonitoringSupport::pad_capacity(0) /* curr_capacity */) { G1MonitoringSupport::pad_capacity(0) /* curr_capacity */) {
update_all(); if (UsePerfData) {
update_all();
}
} }
void G1YoungGenerationCounters::update_all() { void G1YoungGenerationCounters::update_all() {
@ -149,10 +153,6 @@ G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h) :
pad_capacity(0) /* max_capacity */, pad_capacity(0) /* max_capacity */,
pad_capacity(0) /* init_capacity */, pad_capacity(0) /* init_capacity */,
_young_collection_counters); _young_collection_counters);
// Given that this survivor space is not used, we update it here
// once to reflect that its used space is 0 so that we don't have to
// worry about updating it again later.
_from_counters->update_used(0);
// name "generation.0.space.2" // name "generation.0.space.2"
// See _old_space_counters for additional counters // See _old_space_counters for additional counters
@ -160,6 +160,13 @@ G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h) :
pad_capacity(overall_reserved()) /* max_capacity */, pad_capacity(overall_reserved()) /* max_capacity */,
pad_capacity(survivor_space_committed()) /* init_capacity */, pad_capacity(survivor_space_committed()) /* init_capacity */,
_young_collection_counters); _young_collection_counters);
if (UsePerfData) {
// Given that this survivor space is not used, we update it here
// once to reflect that its used space is 0 so that we don't have to
// worry about updating it again later.
_from_counters->update_used(0);
}
} }
void G1MonitoringSupport::recalculate_sizes() { void G1MonitoringSupport::recalculate_sizes() {