8154343: Make SATB related code available to other GCs

Move ptrQueue and satbMarkQueue files from g1 to shared.

Reviewed-by: rkennke, sangheki

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
 #define SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
 
-#include "gc/g1/ptrQueue.hpp"
+#include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
 
 class FreeIdSet;

src/hotspot/share/gc/g1/g1BarrierSet.cpp

@@ -27,9 +27,10 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1CardTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "gc/g1/satbMarkQueue.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #include "logging/log.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"

src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp

@@ -27,7 +27,7 @@
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "gc/g1/satbMarkQueue.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #include "oops/oop.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"

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

@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
 #define SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
 
-#include "gc/g1/satbMarkQueue.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 
 class G1CollectedHeap;
 class JavaThread;

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

@@ -26,7 +26,7 @@
 
 #include "gc/g1/dirtyCardQueue.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
-#include "gc/g1/satbMarkQueue.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/sizes.hpp"

src/hotspot/share/gc/shared/ptrQueue.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/ptrQueue.hpp"
+#include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/mutex.hpp"

src/hotspot/share/gc/shared/ptrQueue.hpp

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_PTRQUEUE_HPP
+#ifndef SHARE_GC_SHARED_PTRQUEUE_HPP
-#define SHARE_VM_GC_G1_PTRQUEUE_HPP
+#define SHARE_GC_SHARED_PTRQUEUE_HPP
 
 #include "utilities/align.hpp"
 #include "utilities/sizes.hpp"
@@ -368,4 +368,4 @@ public:
   void notify_if_necessary();
 };
 
-#endif // SHARE_VM_GC_G1_PTRQUEUE_HPP
+#endif // SHARE_GC_SHARED_PTRQUEUE_HPP

src/hotspot/share/gc/shared/satbMarkQueue.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/satbMarkQueue.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"

src/hotspot/share/gc/shared/satbMarkQueue.hpp

@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_SATBMARKQUEUE_HPP
+#ifndef SHARE_GC_SHARED_SATBMARKQUEUE_HPP
-#define SHARE_VM_GC_G1_SATBMARKQUEUE_HPP
+#define SHARE_GC_SHARED_SATBMARKQUEUE_HPP
 
-#include "gc/g1/ptrQueue.hpp"
+#include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
 
 class JavaThread;
@@ -186,4 +186,4 @@ inline void SATBMarkQueue::apply_filter(Filter filter_out) {
   this->set_index(dst - buf);
 }
 
-#endif // SHARE_VM_GC_G1_SATBMARKQUEUE_HPP
+#endif // SHARE_GC_SHARED_SATBMARKQUEUE_HPP

src/hotspot/share/precompiled/precompiled.hpp

@@ -101,8 +101,10 @@
 # include "gc/shared/generationCounters.hpp"
 # include "gc/shared/jvmFlagConstraintsGC.hpp"
 # include "gc/shared/modRefBarrierSet.hpp"
+# include "gc/shared/ptrQueue.hpp"
 # include "gc/shared/referencePolicy.hpp"
 # include "gc/shared/referenceProcessor.hpp"
+# include "gc/shared/satbMarkQueue.hpp"
 # include "gc/shared/space.hpp"
 # include "gc/shared/spaceDecorator.hpp"
 # include "gc/shared/taskqueue.hpp"
@@ -309,8 +311,6 @@
 # include "gc/g1/g1OopClosures.hpp"
 # include "gc/g1/g1_globals.hpp"
 # include "gc/g1/jvmFlagConstraintsG1.hpp"
-# include "gc/g1/ptrQueue.hpp"
-# include "gc/g1/satbMarkQueue.hpp"
 #endif // INCLUDE_G1GC
 #if INCLUDE_PARALLELGC
 # include "gc/parallel/gcAdaptivePolicyCounters.hpp"