changeset 9611:abd7e1819ef1

Don't pass timer to weak ref processor. We don't use those timings and it triggers asserts.
author rkennke
date Tue, 08 Sep 2015 12:15:42 +0200
parents 5e256d10f5e3
children 06740c15a2b5
files src/share/vm/gc/shenandoah/shenandoahConcurrentMark.cpp src/share/vm/gc/shenandoah/shenandoahMarkCompact.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc/shenandoah/shenandoahConcurrentMark.cpp	Tue Sep 08 12:14:22 2015 +0200
+++ b/src/share/vm/gc/shenandoah/shenandoahConcurrentMark.cpp	Tue Sep 08 12:15:42 2015 +0200
@@ -680,7 +680,7 @@
 
    rp->process_discovered_references(&is_alive, &keep_alive, 
 				     &complete_gc, &par_task_executor, 
-				     ShenandoahHeap::heap()->collector_policy()->conc_timer(),
+				     NULL,
                                      ShenandoahHeap::heap()->tracer()->gc_id());
    
    if (ShenandoahTraceWeakReferences) {
--- a/src/share/vm/gc/shenandoah/shenandoahMarkCompact.cpp	Tue Sep 08 12:14:22 2015 +0200
+++ b/src/share/vm/gc/shenandoah/shenandoahMarkCompact.cpp	Tue Sep 08 12:15:42 2015 +0200
@@ -169,7 +169,7 @@
 				      &MarkSweep::keep_alive,
 				      &MarkSweep::follow_stack_closure,
 				      NULL,
-				      _heap->collector_policy()->conc_timer(),
+				      NULL,
 				      _heap->tracer()->gc_id());
  
   //     heap->tracer()->report_gc_reference_stats(stats);