comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @ 13451:02f27ecb4f3a

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 Dec 2013 00:00:24 +0100
parents 359f7e70ae7f 86e6d691f2e1
children d8041d695d19
comparison
equal deleted inserted replaced
13371:4db09b7304da 13451:02f27ecb4f3a
70 class STWGCTimer; 70 class STWGCTimer;
71 class G1NewTracer; 71 class G1NewTracer;
72 class G1OldTracer; 72 class G1OldTracer;
73 class EvacuationFailedInfo; 73 class EvacuationFailedInfo;
74 class nmethod; 74 class nmethod;
75 class Ticks;
75 76
76 typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue; 77 typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue;
77 typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet; 78 typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
78 79
79 typedef int RegionIdx_t; // needs to hold [ 0..max_regions() ) 80 typedef int RegionIdx_t; // needs to hold [ 0..max_regions() )
749 750
750 unsigned int old_marking_cycles_completed() { 751 unsigned int old_marking_cycles_completed() {
751 return _old_marking_cycles_completed; 752 return _old_marking_cycles_completed;
752 } 753 }
753 754
754 void register_concurrent_cycle_start(jlong start_time); 755 void register_concurrent_cycle_start(const Ticks& start_time);
755 void register_concurrent_cycle_end(); 756 void register_concurrent_cycle_end();
756 void trace_heap_after_concurrent_cycle(); 757 void trace_heap_after_concurrent_cycle();
757 758
758 G1YCType yc_type(); 759 G1YCType yc_type();
759 760