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

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

@@ -36,11 +36,10 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
-#include "utilities/ticks.inline.hpp"
 
 template <class T>
 inline void G1ScanClosureBase::prefetch_and_push(T* p, const oop obj) {
   // We're not going to even bother checking whether the object is
   // already forwarded or not, as this usually causes an immediate

@@ -67,17 +66,11 @@
     _g1h->set_humongous_is_live(obj);
   }
 }
 
 inline void G1ScanClosureBase::trim_queue_partially() {
-  _trim_ticks += _par_scan_state->trim_queue_partially();
-}
-
-inline Tickspan G1ScanClosureBase::trim_ticks_and_reset() {
-  Tickspan result = _trim_ticks;
-  _trim_ticks = Tickspan();
-  return result;
+  _par_scan_state->trim_queue_partially();
 }
 
 template <class T>
 inline void G1ScanEvacuatedObjClosure::do_oop_nv(T* p) {
   T heap_oop = RawAccess<>::oop_load(p);

@@ -212,16 +205,10 @@
   if (_g1h->heap_region_containing(new_obj)->is_young()) {
     _scanned_cld->record_modified_oops();
   }
 }
 
-inline Tickspan G1ParCopyHelper::trim_ticks_and_reset() {
-  Tickspan result = _trim_ticks;
-  _trim_ticks = Tickspan();
-  return result;
-}
-
 void G1ParCopyHelper::mark_object(oop obj) {
   assert(!_g1h->heap_region_containing(obj)->in_collection_set(), "should not mark objects in the CSet");
 
   // We know that the object is not moving so it's safe to read its size.
   _cm->mark_in_next_bitmap(_worker_id, obj);

@@ -241,11 +228,11 @@
   // image which we know should not be changing.
   _cm->mark_in_next_bitmap(_worker_id, to_obj, from_obj->size());
 }
 
 void G1ParCopyHelper::trim_queue_partially() {
-  _trim_ticks += _par_scan_state->trim_queue_partially();
+  _par_scan_state->trim_queue_partially();
 }
 
 template <G1Barrier barrier, G1Mark do_mark_object>
 template <class T>
 void G1ParCopyClosure<barrier, do_mark_object>::do_oop_work(T* p) {