1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Jun 25 15:51:15 2014 -0700 1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Jun 19 13:31:14 2014 +0200 1.3 @@ -26,6 +26,7 @@ 1.4 #define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP 1.5 1.6 #include "gc_implementation/g1/heapRegionSet.hpp" 1.7 +#include "gc_implementation/shared/gcId.hpp" 1.8 #include "utilities/taskqueue.hpp" 1.9 1.10 class G1CollectedHeap; 1.11 @@ -444,6 +445,7 @@ 1.12 volatile bool _concurrent; 1.13 // set at the end of a Full GC so that marking aborts 1.14 volatile bool _has_aborted; 1.15 + GCId _aborted_gc_id; 1.16 1.17 // used when remark aborts due to an overflow to indicate that 1.18 // another concurrent marking phase should start 1.19 @@ -825,6 +827,8 @@ 1.20 1.21 bool has_aborted() { return _has_aborted; } 1.22 1.23 + const GCId& concurrent_gc_id(); 1.24 + 1.25 // This prints the global/local fingers. It is used for debugging. 1.26 NOT_PRODUCT(void print_finger();) 1.27