diff src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents da91efe96a93
children cc5b5976d72c
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Mon Nov 12 23:14:12 2012 +0100
@@ -57,9 +57,12 @@
                           const char* perf_data_name, int level) {
   initialize_virtual_space(rs, alignment);
   initialize_work(perf_data_name, level);
+
   // The old gen can grow to gen_size_limit().  _reserve reflects only
   // the current maximum that can be committed.
   assert(_reserved.byte_size() <= gen_size_limit(), "Consistency check");
+
+  initialize_performance_counters(perf_data_name, level);
 }
 
 void PSOldGen::initialize_virtual_space(ReservedSpace rs, size_t alignment) {
@@ -140,7 +143,9 @@
 
   // Update the start_array
   start_array()->set_covered_region(cmr);
+}
 
+void PSOldGen::initialize_performance_counters(const char* perf_data_name, int level) {
   // Generation Counters, generation 'level', 1 subspace
   _gen_counters = new PSGenerationCounters(perf_data_name, level, 1,
                                            virtual_space());