comparison src/share/vm/gc_implementation/g1/concurrentMark.cpp @ 2125:7246a374a9f2

6458402: 3 jvmti tests fail with CMS and +ExplicitGCInvokesConcurrent Summary: Make JvmtiGCMark safe to run non-safepoint and instrument CMS Reviewed-by: ysr, dcubed
author kamg
date Mon, 10 Jan 2011 17:14:53 -0500
parents b03260081e9b
children 7e37af9d69ef
comparison
equal deleted inserted replaced
2124:e31d8c656c5b 2125:7246a374a9f2
29 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 29 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
30 #include "gc_implementation/g1/g1CollectorPolicy.hpp" 30 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
31 #include "gc_implementation/g1/g1RemSet.hpp" 31 #include "gc_implementation/g1/g1RemSet.hpp"
32 #include "gc_implementation/g1/heapRegionRemSet.hpp" 32 #include "gc_implementation/g1/heapRegionRemSet.hpp"
33 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" 33 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
34 #include "gc_implementation/shared/vmGCOperations.hpp"
34 #include "memory/genOopClosures.inline.hpp" 35 #include "memory/genOopClosures.inline.hpp"
35 #include "memory/referencePolicy.hpp" 36 #include "memory/referencePolicy.hpp"
36 #include "memory/resourceArea.hpp" 37 #include "memory/resourceArea.hpp"
37 #include "oops/oop.inline.hpp" 38 #include "oops/oop.inline.hpp"
38 #include "runtime/handles.inline.hpp" 39 #include "runtime/handles.inline.hpp"
1139 // If a full collection has happened, we shouldn't do this. 1140 // If a full collection has happened, we shouldn't do this.
1140 if (has_aborted()) { 1141 if (has_aborted()) {
1141 g1h->set_marking_complete(); // So bitmap clearing isn't confused 1142 g1h->set_marking_complete(); // So bitmap clearing isn't confused
1142 return; 1143 return;
1143 } 1144 }
1145
1146 SvcGCMarker sgcm(SvcGCMarker::OTHER);
1144 1147
1145 if (VerifyDuringGC) { 1148 if (VerifyDuringGC) {
1146 HandleMark hm; // handle scope 1149 HandleMark hm; // handle scope
1147 gclog_or_tty->print(" VerifyDuringGC:(before)"); 1150 gclog_or_tty->print(" VerifyDuringGC:(before)");
1148 Universe::heap()->prepare_for_verify(); 1151 Universe::heap()->prepare_for_verify();