Eliminate locks from the marking service.

PullRequest: truffleruby/659

Author: aardvark179

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -1541,8 +1541,8 @@ public abstract static class PushPreservingFrame extends CoreMethodArrayArgument
 
         @Specialization
         public DynamicObject pushFrame(VirtualFrame frame,
-                @Cached("create()") MarkingServiceNodes.GetPreservationStackNode getStackNode) {
-            getStackNode.execute(frame).push();
+                @Cached("create()") MarkingServiceNodes.GetMarkerThreadLocalDataNode getDataNode) {
+            getDataNode.execute(frame).getPreservationStack().push();
             return nil();
         }
     }
@@ -1552,8 +1552,8 @@ public abstract static class PopPreservingFrame extends CoreMethodArrayArguments
 
         @Specialization
         public DynamicObject popFrame(VirtualFrame frame,
-                @Cached("create()") MarkingServiceNodes.GetPreservationStackNode getStackNode) {
-            getStackNode.execute(frame).pop();
+                @Cached("create()") MarkingServiceNodes.GetMarkerThreadLocalDataNode getDataNode) {
+            getDataNode.execute(frame).getPreservationStack().pop();
             return nil();
         }
     }

src/main/java/org/truffleruby/core/FinalizationService.java

@@ -9,14 +9,14 @@
  */
 package org.truffleruby.core;
 
-import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Set;
 
 import org.truffleruby.RubyContext;
+import org.truffleruby.core.ReferenceProcessingService.PhantomProcessingReference;
 
 import com.oracle.truffle.api.object.DynamicObject;
 import org.truffleruby.language.objects.ObjectGraphNode;
@@ -52,38 +52,16 @@ public DynamicObject getRoot() {
         }
     }
 
-    public static class FinalizerReference extends PhantomReference<Object> implements ReferenceProcessingService.ProcessingReference<FinalizerReference>, ObjectGraphNode {
+    public static class FinalizerReference extends PhantomProcessingReference<FinalizerReference, Object> implements ObjectGraphNode {
 
         /**
          * All accesses to this Deque must be synchronized by taking the
          * {@link FinalizationService} monitor, to avoid concurrent access.
          */
         private final Deque<Finalizer> finalizers = new LinkedList<>();
-        private final FinalizationService service;
-
-        /** The doubly-linked list of FinalizerReference, needed to collect finalizer Procs for ObjectSpace. */
-        FinalizerReference next = null;
-        FinalizerReference prev = null;
 
         private FinalizerReference(Object object, ReferenceQueue<? super Object> queue, FinalizationService service) {
-            super(object, queue);
-            this.service = service;
-        }
-
-        public FinalizerReference getPrevious() {
-            return prev;
-        }
-
-        public void setPrevious(FinalizerReference previous) {
-            prev = previous;
-        }
-
-        public FinalizerReference getNext() {
-            return next;
-        }
-
-        public void setNext(FinalizerReference next) {
-            this.next = next;
+            super(object, queue, service);
         }
 
         private void addFinalizer(Class<?> owner, Runnable action, DynamicObject root) {
@@ -114,10 +92,6 @@ private void collectRoots(Collection<DynamicObject> roots) {
             }
         }
 
-        public ReferenceProcessingService<FinalizerReference> service() {
-            return service;
-        }
-
         @Override
         public void getAdjacentObjects(Set<DynamicObject> reachable) {
             collectRoots(reachable);
@@ -171,7 +145,7 @@ public synchronized void collectRoots(Collection<DynamicObject> roots) {
         FinalizerReference finalizerReference = getFirst();
         while (finalizerReference != null) {
             finalizerReference.collectRoots(roots);
-            finalizerReference = finalizerReference.next;
+            finalizerReference = finalizerReference.getNext();
         }
     }