comparison src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp @ 6866:633ba56cb013

Merge
author jmasa
date Wed, 17 Oct 2012 13:59:57 -0700
parents b9a9ed0f8eeb 4202510ee0fe
children f2110083203d
comparison
equal deleted inserted replaced
6861:58fbf2da3c16 6866:633ba56cb013
62 GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) { 62 GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
63 HandleMark hm; 63 HandleMark hm;
64 FreelistLocker x(_collector); 64 FreelistLocker x(_collector);
65 MutexLockerEx y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag); 65 MutexLockerEx y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
66 Universe::heap()->prepare_for_verify(); 66 Universe::heap()->prepare_for_verify();
67 Universe::verify(true); 67 Universe::verify();
68 } 68 }
69 } 69 }
70 70
71 void VM_CMS_Operation::verify_after_gc() { 71 void VM_CMS_Operation::verify_after_gc() {
72 if (VerifyAfterGC && 72 if (VerifyAfterGC &&
73 GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) { 73 GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
74 HandleMark hm; 74 HandleMark hm;
75 FreelistLocker x(_collector); 75 FreelistLocker x(_collector);
76 MutexLockerEx y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag); 76 MutexLockerEx y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
77 Universe::verify(true); 77 Universe::verify();
78 } 78 }
79 } 79 }
80 80
81 bool VM_CMS_Operation::lost_race() const { 81 bool VM_CMS_Operation::lost_race() const {
82 if (CMSCollector::abstract_state() == CMSCollector::Idling) { 82 if (CMSCollector::abstract_state() == CMSCollector::Idling) {