1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Thu May 16 13:02:33 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Thu May 16 09:24:26 2013 -0700
1.3 @@ -175,7 +175,6 @@
1.4 CollectionSetChooser* _collectionSetChooser;
1.5
1.6 double _full_collection_start_sec;
1.7 - size_t _cur_collection_pause_used_at_start_bytes;
1.8 uint _cur_collection_pause_used_regions_at_start;
1.9
1.10 // These exclude marking times.
1.11 @@ -194,7 +193,6 @@
1.12
1.13 uint _young_list_target_length;
1.14 uint _young_list_fixed_length;
1.15 - size_t _prev_eden_capacity; // used for logging
1.16
1.17 // The max number of regions we can extend the eden by while the GC
1.18 // locker is active. This should be >= _young_list_target_length;
1.19 @@ -693,11 +691,11 @@
1.20
1.21 // Records the information about the heap size for reporting in
1.22 // print_detailed_heap_transition
1.23 - void record_heap_size_info_at_start();
1.24 + void record_heap_size_info_at_start(bool full);
1.25
1.26 // Print heap sizing transition (with less and more detail).
1.27 void print_heap_transition();
1.28 - void print_detailed_heap_transition();
1.29 + void print_detailed_heap_transition(bool full = false);
1.30
1.31 void record_stop_world_start();
1.32 void record_concurrent_pause();
1.33 @@ -861,9 +859,16 @@
1.34 uint _max_survivor_regions;
1.35
1.36 // For reporting purposes.
1.37 - size_t _eden_bytes_before_gc;
1.38 - size_t _survivor_bytes_before_gc;
1.39 - size_t _capacity_before_gc;
1.40 + // The value of _heap_bytes_before_gc is also used to calculate
1.41 + // the cost of copying.
1.42 +
1.43 + size_t _eden_used_bytes_before_gc; // Eden occupancy before GC
1.44 + size_t _survivor_used_bytes_before_gc; // Survivor occupancy before GC
1.45 + size_t _heap_used_bytes_before_gc; // Heap occupancy before GC
1.46 + size_t _metaspace_used_bytes_before_gc; // Metaspace occupancy before GC
1.47 +
1.48 + size_t _eden_capacity_bytes_before_gc; // Eden capacity before GC
1.49 + size_t _heap_capacity_bytes_before_gc; // Heap capacity before GC
1.50
1.51 // The amount of survivor regions after a collection.
1.52 uint _recorded_survivor_regions;
