comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.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 7c5250dbd584
children ffd725ff6943
comparison
equal deleted inserted replaced
2124:e31d8c656c5b 2125:7246a374a9f2
1190 size_t word_size) { 1190 size_t word_size) {
1191 if (GC_locker::check_active_before_gc()) { 1191 if (GC_locker::check_active_before_gc()) {
1192 return false; 1192 return false;
1193 } 1193 }
1194 1194
1195 DTraceGCProbeMarker gc_probe_marker(true /* full */); 1195 SvcGCMarker sgcm(SvcGCMarker::FULL);
1196 ResourceMark rm; 1196 ResourceMark rm;
1197 1197
1198 if (PrintHeapAtGC) { 1198 if (PrintHeapAtGC) {
1199 Universe::print_heap_before_gc(); 1199 Universe::print_heap_before_gc();
1200 } 1200 }
3212 G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) { 3212 G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
3213 if (GC_locker::check_active_before_gc()) { 3213 if (GC_locker::check_active_before_gc()) {
3214 return false; 3214 return false;
3215 } 3215 }
3216 3216
3217 DTraceGCProbeMarker gc_probe_marker(false /* full */); 3217 SvcGCMarker sgcm(SvcGCMarker::MINOR);
3218 ResourceMark rm; 3218 ResourceMark rm;
3219 3219
3220 if (PrintHeapAtGC) { 3220 if (PrintHeapAtGC) {
3221 Universe::print_heap_before_gc(); 3221 Universe::print_heap_before_gc();
3222 } 3222 }