Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1MonitoringSupport.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 | 1a8fb39bdbc4 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
259 to_counters()->update_used(survivor_space_used()); | 259 to_counters()->update_used(survivor_space_used()); |
260 old_space_counters()->update_capacity(pad_capacity(old_space_committed())); | 260 old_space_counters()->update_capacity(pad_capacity(old_space_committed())); |
261 old_space_counters()->update_used(old_space_used()); | 261 old_space_counters()->update_used(old_space_used()); |
262 old_collection_counters()->update_all(); | 262 old_collection_counters()->update_all(); |
263 young_collection_counters()->update_all(); | 263 young_collection_counters()->update_all(); |
264 MetaspaceCounters::update_performance_counters(); | |
264 } | 265 } |
265 } | 266 } |
266 | 267 |
267 void G1MonitoringSupport::update_eden_size() { | 268 void G1MonitoringSupport::update_eden_size() { |
268 recalculate_eden_size(); | 269 recalculate_eden_size(); |