src/share/vm/runtime/thread.hpp

rev 14442 : Backout: Refactor evac-in-progress flag to more general gc-phase flag.

@@ -1021,13 +1021,10 @@
     int _line;
   }   _jmp_ring[jump_ring_buffer_size];
 #endif // PRODUCT
 
 #if INCLUDE_ALL_GCS
-
-  static char _gc_phase_in_progress_global;
-  char _gc_phase_in_progress;
   // Support for G1 barriers
 
   SATBMarkQueue _satb_mark_queue;        // Thread-local log for SATB barrier.
   // Set of all such queues.
   static SATBMarkQueueSet _satb_mark_queue_set;

@@ -1036,10 +1033,12 @@
   // Set of all such queues.
   static DirtyCardQueueSet _dirty_card_queue_set;
 
   void flush_barrier_queues();
 
+  bool _evacuation_in_progress;
+  static bool _evacuation_in_progress_global;
 
 #endif // INCLUDE_ALL_GCS
 
   friend class VMThread;
   friend class ThreadWaitTransition;

@@ -1605,11 +1604,11 @@
 
 #if INCLUDE_ALL_GCS
   static ByteSize satb_mark_queue_offset()       { return byte_offset_of(JavaThread, _satb_mark_queue); }
   static ByteSize dirty_card_queue_offset()      { return byte_offset_of(JavaThread, _dirty_card_queue); }
 
-  static ByteSize gc_phase_in_progress_offset()  { return byte_offset_of(JavaThread, _gc_phase_in_progress); }
+  static ByteSize evacuation_in_progress_offset() { return byte_offset_of(JavaThread, _evacuation_in_progress); }
 
 #endif // INCLUDE_ALL_GCS
 
   // Returns the jni environment for this thread
   JNIEnv* jni_environment()                      { return &_jni_environment; }

@@ -1892,18 +1891,15 @@
   DirtyCardQueue& dirty_card_queue() { return _dirty_card_queue; }
   static DirtyCardQueueSet& dirty_card_queue_set() {
     return _dirty_card_queue_set;
   }
 
-  inline char gc_phase_in_progress() const;
-
-private:
-  void set_gc_phase_in_progress(char in_prog);
+  bool evacuation_in_progress() const;
 
-public:
-  static void set_gc_phase_in_progress_all_threads(char in_prog);
+  void set_evacuation_in_progress(bool in_prog);
 
+  static void set_evacuation_in_progress_all_threads(bool in_prog);
 #endif // INCLUDE_ALL_GCS
 
   // This method initializes the SATB and dirty card queues before a
   // JavaThread is added to the Java thread list. Right now, we don't
   // have to do anything to the dirty card queue (it should have been