fixes

neethu-prasad · Aug 1, 2024 · 3cb8e1c · 3cb8e1c
1 parent 045eb14
commit 3cb8e1c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -205,9 +205,7 @@ void ShenandoahConcurrentMark::concurrent_mark() {
 
   ShenandoahSATBMarkQueueSet& qset = ShenandoahBarrierSet::satb_mark_queue_set();
   ShenandoahFlushSATBHandshakeClosure flush_satb(qset);
-  double handshake_total_time = 0;
-  uint flushes;
-  for (flushes = 0; flushes < ShenandoahMaxSATBBufferFlushes; flushes++) {
+  for (uint flushes = 0; flushes < ShenandoahMaxSATBBufferFlushes; flushes++) {
     TaskTerminator terminator(nworkers, task_queues());
     ShenandoahConcurrentMarkingTask<NON_GEN> task(this, &terminator);
     workers->run_task(&task);
@@ -229,7 +227,6 @@ void ShenandoahConcurrentMark::concurrent_mark() {
       break;
     }
   }
-
   assert(task_queues()->is_empty() || heap->cancelled_gc(), "Should be empty when not cancelled");
 }
 

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -217,13 +217,13 @@ class ShenandoahPhaseTimings : public CHeapObj<mtGC> {
   ShenandoahWorkerData* worker_data(Phase phase, ParPhase par_phase);
   Phase worker_par_phase(Phase phase, ParPhase par_phase);
 
-  void set_cycle_data(Phase phase, double time, bool should_aggregate=false);
+  void set_cycle_data(Phase phase, double time, bool should_aggregate_cycles=false);
   static double uninitialized() { return -1; }
 
 public:
   ShenandoahPhaseTimings(uint max_workers);
 
-  void record_phase_time(Phase phase, double time, bool should_aggregate=false);
+  void record_phase_time(Phase phase, double time, bool should_aggregate_cycles=false);
 
   void record_workers_start(Phase phase);
   void record_workers_end(Phase phase);
@@ -237,11 +237,11 @@ class ShenandoahPhaseTimings : public CHeapObj<mtGC> {
   }
 
   static const char* phase_name_without_leading_whitespace(Phase phase) {
-    const char* current_phase_name = phase_name(phase);
-    while (*current_phase_name == ' ') {
-      current_phase_name++;
+    const char* trimmed_phase_name = phase_name(phase);
+    while (*trimmed_phase_name == ' ') {
+      trimmed_phase_name++;
     }
-    return current_phase_name;
+    return trimmed_phase_name;
   }
 
   void print_cycle_on(outputStream* out) const;

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
@@ -111,11 +111,6 @@ ShenandoahConcurrentPhase::~ShenandoahConcurrentPhase() {
   _timer->register_gc_concurrent_end();
 }
 
-ShenandoahTimingsTracker::ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase) :
-  ShenandoahTimingsTracker(phase, false) {
-
-  }
-
 ShenandoahTimingsTracker::ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase, bool should_aggregate_cycles) :
   _timings(ShenandoahHeap::heap()->phase_timings()), _phase(phase) {
   assert(Thread::current()->is_VM_thread() || Thread::current()->is_ConcurrentGC_thread(),
@@ -131,8 +126,8 @@ ShenandoahTimingsTracker::~ShenandoahTimingsTracker() {
   double end_time = os::elapsedTime();
   double phase_elapsed_time = end_time - _start;
   _timings->record_phase_time(_phase, phase_elapsed_time, _should_aggregate_cycles);
-    log_info(gc, phases) ("Ended phase : %s. Elapsed time %f ms", ShenandoahPhaseTimings::phase_name_without_leading_whitespace(_phase), phase_elapsed_time * MILLIUNITS);
   _current_phase = _parent_phase;
+  log_info(gc, phases) ("Ended phase : %s. Elapsed time %f ms", ShenandoahPhaseTimings::phase_name_without_leading_whitespace(_phase), phase_elapsed_time * MILLIUNITS);
 }
 
 bool ShenandoahTimingsTracker::is_current_phase_valid() {

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
@@ -69,8 +69,7 @@ class ShenandoahTimingsTracker : public StackObj {
   bool _should_aggregate_cycles;
 
 public:
-  ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase);
-  ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase, bool should_aggregate_cycles);
+  ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase, bool should_aggregate_cycles=false);
   ~ShenandoahTimingsTracker();
 
   static ShenandoahPhaseTimings::Phase current_phase() { return _current_phase; }