comparison src/share/vm/gc_implementation/g1/concurrentMark.cpp @ 8721:47bc9800972c

8006498: #if <symbol> is wrong in the code. Summary: ASSERT and other symbols used incorrectly with #if are supposed to be defined or not. Reviewed-by: dholmes, mikael
author jprovino
date Wed, 06 Mar 2013 13:46:55 -0500
parents 5e401ef52ec0
children 15401203db6b
comparison
equal deleted inserted replaced
8720:fad90b102190 8721:47bc9800972c
1307 1307
1308 // Expand the marking stack, if we have to and if we can. 1308 // Expand the marking stack, if we have to and if we can.
1309 if (_markStack.should_expand()) { 1309 if (_markStack.should_expand()) {
1310 _markStack.expand(); 1310 _markStack.expand();
1311 } 1311 }
1312
1313 #if VERIFY_OBJS_PROCESSED
1314 _scan_obj_cl.objs_processed = 0;
1315 ThreadLocalObjQueue::objs_enqueued = 0;
1316 #endif
1317 1312
1318 // Statistics 1313 // Statistics
1319 double now = os::elapsedTime(); 1314 double now = os::elapsedTime();
1320 _remark_mark_times.add((mark_work_end - start) * 1000.0); 1315 _remark_mark_times.add((mark_work_end - start) * 1000.0);
1321 _remark_weak_ref_times.add((now - mark_work_end) * 1000.0); 1316 _remark_weak_ref_times.add((now - mark_work_end) * 1000.0);
2553 } 2548 }
2554 SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set(); 2549 SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
2555 guarantee(satb_mq_set.completed_buffers_num() == 0, "invariant"); 2550 guarantee(satb_mq_set.completed_buffers_num() == 0, "invariant");
2556 2551
2557 print_stats(); 2552 print_stats();
2558
2559 #if VERIFY_OBJS_PROCESSED
2560 if (_scan_obj_cl.objs_processed != ThreadLocalObjQueue::objs_enqueued) {
2561 gclog_or_tty->print_cr("Processed = %d, enqueued = %d.",
2562 _scan_obj_cl.objs_processed,
2563 ThreadLocalObjQueue::objs_enqueued);
2564 guarantee(_scan_obj_cl.objs_processed ==
2565 ThreadLocalObjQueue::objs_enqueued,
2566 "Different number of objs processed and enqueued.");
2567 }
2568 #endif
2569 } 2553 }
2570 2554
2571 #ifndef PRODUCT 2555 #ifndef PRODUCT
2572 2556
2573 class PrintReachableOopClosure: public OopClosure { 2557 class PrintReachableOopClosure: public OopClosure {