comparison src/share/vm/gc_implementation/g1/vm_operations_g1.cpp @ 20771:9fa3bf3043a2

Merge
author asaha
date Wed, 26 Nov 2014 08:14:21 -0800
parents 4e4ebe50c8e3
children
comparison
equal deleted inserted replaced
20770:02c7eebe5f52 20771:9fa3bf3043a2
211 211
212 void VM_CGC_Operation::acquire_pending_list_lock() { 212 void VM_CGC_Operation::acquire_pending_list_lock() {
213 assert(_needs_pll, "don't call this otherwise"); 213 assert(_needs_pll, "don't call this otherwise");
214 // The caller may block while communicating 214 // The caller may block while communicating
215 // with the SLT thread in order to acquire/release the PLL. 215 // with the SLT thread in order to acquire/release the PLL.
216 ConcurrentMarkThread::slt()-> 216 SurrogateLockerThread* slt = ConcurrentMarkThread::slt();
217 manipulatePLL(SurrogateLockerThread::acquirePLL); 217 if (slt != NULL) {
218 slt->manipulatePLL(SurrogateLockerThread::acquirePLL);
219 } else {
220 SurrogateLockerThread::report_missing_slt();
221 }
218 } 222 }
219 223
220 void VM_CGC_Operation::release_and_notify_pending_list_lock() { 224 void VM_CGC_Operation::release_and_notify_pending_list_lock() {
221 assert(_needs_pll, "don't call this otherwise"); 225 assert(_needs_pll, "don't call this otherwise");
222 // The caller may block while communicating 226 // The caller may block while communicating