< prev index next >

src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp

Print this page

        

@@ -29,21 +29,21 @@
 #include "gc/shared/softRefPolicy.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahLock.hpp"
-#include "gc/shenandoah/shenandoahEvacOOMHandler.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
 #include "gc/shenandoah/shenandoahUnload.hpp"
 #include "services/memoryManager.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ConcurrentGCTimer;
 class ReferenceProcessor;
 class ShenandoahCollectorPolicy;
 class ShenandoahControlThread;
+class ShenandoahEvacLockingBitmap;
 class ShenandoahGCSession;
 class ShenandoahGCStateResetter;
 class ShenandoahHeuristics;
 class ShenandoahMarkingContext;
 class ShenandoahMarkCompact;

@@ -676,11 +676,14 @@
 
 // ---------- Evacuation support
 //
 private:
   ShenandoahCollectionSet* _collection_set;
-  ShenandoahEvacOOMHandler _oom_evac_handler;
+
+  MemRegion  _evac_locking_bitmap_region;
+  ShenandoahEvacLockingBitmap* _evac_locking_bitmap;
+  ShenandoahSharedFlag _evac_failed;
 
   void evacuate_and_update_roots();
 
 public:
   static address in_cset_fast_test_addr();

@@ -695,14 +698,10 @@
 
   // Evacuates object src. Returns the evacuated object, either evacuated
   // by this thread, or by some other thread.
   inline oop evacuate_object(oop src, Thread* thread);
 
-  // Call before/after evacuation.
-  inline void enter_evacuation(Thread* t);
-  inline void leave_evacuation(Thread* t);
-
 // ---------- Helper functions
 //
 public:
   template <class T>
   inline oop evac_update_with_forwarded(T* p);
< prev index next >