@@ -37,7 +37,7 @@ void G1ConcurrentRefineStats::add_atomic(const G1LocalRefineStats* other) {
 }
 
 void G1ConcurrentRefineStats::reset() {
-  _sweep_duration.store_relaxed(0);
+  _sweep_work_duration.store_relaxed(0);
   _yield_during_sweep_duration.store_relaxed(0);
   _cards_scanned.store_relaxed(0);
   _cards_clean.store_relaxed(0);
 
@@ -51,8 +51,8 @@ struct G1LocalRefineStats {
 
 // Global statistics for concurrent refinement processing.
 class G1ConcurrentRefineStats : public CHeapObj<mtGC> {
-  Atomic<jlong> _sweep_duration;              // Time spent sweeping the table finding non-clean cards
-                                              // and refining them.
+  Atomic<jlong> _sweep_work_duration;         // Time spent sweeping the table finding non-clean cards
+                                              // and refining them without yields.
   Atomic<jlong> _yield_during_sweep_duration; // Time spent yielding during the sweep (not doing the sweep).
 
   Atomic<size_t> _cards_scanned;              // Total number of cards scanned.
@@ -67,7 +67,7 @@ class G1ConcurrentRefineStats : public CHeapObj<mtGC> {
 public:
   // Time spent performing sweeping the refinement table (includes actual refinement,
   // but not yield time).
-  inline jlong sweep_duration() const;
+  inline jlong sweep_work_duration() const;
   inline jlong yield_during_sweep_duration() const;
   inline jlong refine_duration() const;
 
 
@@ -27,8 +27,8 @@
 
 #include "gc/g1/g1ConcurrentRefineStats.hpp"
 
-inline jlong G1ConcurrentRefineStats::sweep_duration() const {
-  return _sweep_duration.load_relaxed() - yield_during_sweep_duration();
+inline jlong G1ConcurrentRefineStats::sweep_work_duration() const {
+  return _sweep_work_duration.load_relaxed();
 }
 
 inline jlong G1ConcurrentRefineStats::yield_during_sweep_duration() const {
@@ -80,7 +80,7 @@ inline size_t G1ConcurrentRefineStats::cards_to_cset() const {
 }
 
 inline void G1ConcurrentRefineStats::inc_sweep_duration(jlong t) {
-  _sweep_duration.fetch_then_add(t, memory_order_relaxed);
+  _sweep_work_duration.fetch_then_add(t, memory_order_relaxed);
 }
 
 inline void G1ConcurrentRefineStats::inc_yield_during_sweep_duration(jlong t) {
 
@@ -612,7 +612,7 @@ void G1Policy::record_full_collection_end(size_t allocation_word_size) {
 static void log_refinement_stats(const G1ConcurrentRefineStats& stats) {
   log_debug(gc, refine, stats)
            ("Refinement: sweep: %.2fms, yield: %.2fms refined: %zu, dirtied: %zu",
-            TimeHelper::counter_to_millis(stats.sweep_duration()),
+            TimeHelper::counter_to_millis(stats.sweep_work_duration()),
             TimeHelper::counter_to_millis(stats.yield_during_sweep_duration()),
             stats.refined_cards(),
             stats.cards_pending());
@@ -624,7 +624,7 @@ void G1Policy::record_refinement_stats(G1ConcurrentRefineStats* refine_stats) {
   // Record the rate at which cards were refined.
   // Don't update the rate if the current sample is empty or time is zero (which is
   // the case during GC).
-  double refinement_time = TimeHelper::counter_to_millis(refine_stats->sweep_duration());
+  double refinement_time = TimeHelper::counter_to_millis(refine_stats->sweep_work_duration());
   size_t refined_cards = refine_stats->refined_cards();
   if ((refined_cards > 0) && (refinement_time > 0)) {
     double rate = refined_cards / refinement_time;
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void G1ConcurrentRefineStats::add_atomic(const G1LocalRefineStats* other) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`void G1ConcurrentRefineStats::reset() {`
`40`		`- _sweep_duration.store_relaxed(0);`
	`40`	`+ _sweep_work_duration.store_relaxed(0);`
`41`	`41`	`_yield_during_sweep_duration.store_relaxed(0);`
`42`	`42`	`_cards_scanned.store_relaxed(0);`
`43`	`43`	`_cards_clean.store_relaxed(0);`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@`
`27`	`27`
`28`	`28`	`#include "gc/g1/g1ConcurrentRefineStats.hpp"`
`29`	`29`
`30`		`-inline jlong G1ConcurrentRefineStats::sweep_duration() const {`
`31`		`- return _sweep_duration.load_relaxed() - yield_during_sweep_duration();`
	`30`	`+inline jlong G1ConcurrentRefineStats::sweep_work_duration() const {`
	`31`	`+ return _sweep_work_duration.load_relaxed();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`inline jlong G1ConcurrentRefineStats::yield_during_sweep_duration() const {`
`@@ -80,7 +80,7 @@ inline size_t G1ConcurrentRefineStats::cards_to_cset() const {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`inline void G1ConcurrentRefineStats::inc_sweep_duration(jlong t) {`
`83`		`- _sweep_duration.fetch_then_add(t, memory_order_relaxed);`
	`83`	`+ _sweep_work_duration.fetch_then_add(t, memory_order_relaxed);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`inline void G1ConcurrentRefineStats::inc_yield_during_sweep_duration(jlong t) {`