src/hotspot/share/gc/g1/g1OopClosures.hpp

rev 49678 : imported patch 8200426-sangheon-review
rev 49680 : imported patch 6672778-partial-queue-trimming
rev 49681 : [mq]: 6672778-refactoring

@@ -26,11 +26,10 @@
 #define SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
 
 #include "gc/g1/g1InCSetState.hpp"
 #include "memory/iterator.hpp"
 #include "oops/markOop.hpp"
-#include "utilities/ticks.hpp"
 
 class HeapRegion;
 class G1CollectedHeap;
 class G1RemSet;
 class G1ConcurrentMark;

@@ -43,11 +42,10 @@
 class G1ScanClosureBase : public ExtendedOopClosure {
 protected:
   G1CollectedHeap* _g1h;
   G1ParScanThreadState* _par_scan_state;
   HeapRegion* _from;
-  Tickspan _trim_ticks;
 
   G1ScanClosureBase(G1CollectedHeap* g1h, G1ParScanThreadState* par_scan_state);
   ~G1ScanClosureBase() { }
 
   template <class T>

@@ -57,14 +55,12 @@
   inline void handle_non_cset_obj_common(InCSetState const state, T* p, oop const obj);
 public:
   // This closure needs special handling for InstanceRefKlass.
   virtual ReferenceIterationMode reference_iteration_mode() { return DO_DISCOVERED_AND_DISCOVERY; }
   void set_region(HeapRegion* from) { _from = from; }
-  inline void trim_queue_partially();
 
-  // Returns the currently accumulated time during partial queue triming and resets the counter.
-  Tickspan trim_ticks_and_reset();
+  inline void trim_queue_partially();
 };
 
 // Used during the Update RS phase to refine remaining cards in the DCQ during garbage collection.
 class G1ScanObjsDuringUpdateRSClosure: public G1ScanClosureBase {
   uint _worker_i;

@@ -113,11 +109,10 @@
   G1CollectedHeap* _g1h;
   G1ParScanThreadState* _par_scan_state;
   uint _worker_id;              // Cache value from par_scan_state.
   ClassLoaderData* _scanned_cld;
   G1ConcurrentMark* _cm;
-  Tickspan _trim_ticks;
 
   // Mark the object if it's not already marked. This is used to mark
   // objects pointed to by roots that are guaranteed not to move
   // during the GC (i.e., non-CSet objects). It is MT-safe.
   inline void mark_object(oop obj);

@@ -129,16 +124,14 @@
 
   G1ParCopyHelper(G1CollectedHeap* g1h,  G1ParScanThreadState* par_scan_state);
   ~G1ParCopyHelper() { }
 
  public:
-  inline void trim_queue_partially();
   void set_scanned_cld(ClassLoaderData* cld) { _scanned_cld = cld; }
   inline void do_cld_barrier(oop new_obj);
 
-  // Returns the currently accumulated time during partial queue triming and resets the counter.
-  Tickspan trim_ticks_and_reset();
+  inline void trim_queue_partially();
 };
 
 enum G1Barrier {
   G1BarrierNone,
   G1BarrierCLD