jruby · Aug 18, 2015 · Aug 18, 2015 · Aug 18, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/ThreadLocalObjectNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/ThreadLocalObjectNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.nodes.core.ThreadNodes;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.layouts.Layouts;
 
 public class ThreadLocalObjectNode extends RubyNode {
 
@@ -23,7 +23,7 @@ public ThreadLocalObjectNode(RubyContext context, SourceSection sourceSection) {
 
     @Override
     public DynamicObject executeDynamicObject(VirtualFrame frame) {
-        return ThreadNodes.getThreadLocals(getContext().getThreadManager().getCurrentThread());
+        return Layouts.THREAD.getThreadLocals(getContext().getThreadManager().getCurrentThread());
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/FiberNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/FiberNodes.java
@@ -99,7 +99,7 @@ public static void start(DynamicObject fiber) {
         assert RubyGuards.isRubyFiber(fiber);
         Layouts.FIBER.getFields(fiber).thread = Thread.currentThread();
         Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(fiber)).getContext().getThreadManager().initializeCurrentThread(Layouts.FIBER.getFields(fiber).rubyThread);
-        ThreadNodes.getFiberManager(Layouts.FIBER.getFields(fiber).rubyThread).registerFiber(fiber);
+        Layouts.THREAD.getFiberManager(Layouts.FIBER.getFields(fiber).rubyThread).registerFiber(fiber);
         Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(fiber)).getContext().getSafepointManager().enterThread();
     }
 
@@ -108,7 +108,7 @@ public static void cleanup(DynamicObject fiber) {
         assert RubyGuards.isRubyFiber(fiber);
         Layouts.FIBER.getFields(fiber).alive = false;
         Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(fiber)).getContext().getSafepointManager().leaveThread();
-        ThreadNodes.getFiberManager(Layouts.FIBER.getFields(fiber).rubyThread).unregisterFiber(fiber);
+        Layouts.THREAD.getFiberManager(Layouts.FIBER.getFields(fiber).rubyThread).unregisterFiber(fiber);
         Layouts.FIBER.getFields(fiber).thread = null;
     }
 
@@ -132,7 +132,7 @@ public FiberMessage block() throws InterruptedException {
             }
         });
 
-        ThreadNodes.getFiberManager(Layouts.FIBER.getFields(fiber).rubyThread).setCurrentFiber(fiber);
+        Layouts.THREAD.getFiberManager(Layouts.FIBER.getFields(fiber).rubyThread).setCurrentFiber(fiber);
 
         if (message instanceof FiberExitMessage) {
             throw new FiberExitException();
@@ -229,7 +229,7 @@ protected Object transfer(VirtualFrame frame, DynamicObject fiber, boolean isYie
                 throw new RaiseException(getContext().getCoreLibrary().fiberError("fiber called across threads", this));
             }
 
-            final DynamicObject sendingFiber = ThreadNodes.getFiberManager(currentThread).getCurrentFiber();
+            final DynamicObject sendingFiber = Layouts.THREAD.getFiberManager(currentThread).getCurrentFiber();
 
             return singleValue(frame, transferControlTo(sendingFiber, fiber, isYield, args));
         }
@@ -283,7 +283,7 @@ public YieldNode(RubyContext context, SourceSection sourceSection) {
         @Specialization
         public Object yield(VirtualFrame frame, Object[] args) {
             final DynamicObject currentThread = getContext().getThreadManager().getCurrentThread();
-            final DynamicObject yieldingFiber = ThreadNodes.getFiberManager(currentThread).getCurrentFiber();
+            final DynamicObject yieldingFiber = Layouts.THREAD.getFiberManager(currentThread).getCurrentFiber();
             final DynamicObject fiberYieldedTo = Layouts.FIBER.getFields(yieldingFiber).lastResumedByFiber;
 
             if (Layouts.FIBER.getFields(yieldingFiber).isRootFiber || fiberYieldedTo == null) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1847,7 +1847,7 @@ private long doSleepMillis(final long durationInMillis) {
 
             // Clear the wakeUp flag, following Ruby semantics:
             // it should only be considered if we are inside the sleep when Thread#{run,wakeup} is called.
-            ThreadNodes.shouldWakeUp(thread);
+            Layouts.THREAD.getWakeUp(thread).getAndSet(false);
 
             return sleepFor(getContext(), durationInMillis);
         }
@@ -1865,7 +1865,7 @@ public Long block() throws InterruptedException {
                     long now = System.currentTimeMillis();
                     long slept = now - start;
 
-                    if (slept >= durationInMillis || ThreadNodes.shouldWakeUp(thread)) {
+                    if (slept >= durationInMillis || Layouts.THREAD.getWakeUp(thread).getAndSet(false)) {
                         return slept;
                     }
                     Thread.sleep(durationInMillis - slept);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java
@@ -71,7 +71,7 @@ protected static void lock(final ReentrantLock lock, final DynamicObject thread,
                 @Override
                 public Boolean block() throws InterruptedException {
                     lock.lockInterruptibly();
-                    ThreadNodes.acquiredLock(thread, lock);
+                    Layouts.THREAD.getOwnedLocks(thread).add(lock);
                     return SUCCESS;
                 }
             });
@@ -124,7 +124,7 @@ public boolean tryLock(DynamicObject mutex) {
 
             if (lock.tryLock()) {
                 final DynamicObject thread = getContext().getThreadManager().getCurrentThread();
-                ThreadNodes.acquiredLock(thread, lock);
+                Layouts.THREAD.getOwnedLocks(thread).add(lock);
                 return true;
             } else {
                 return false;
@@ -165,7 +165,7 @@ protected static void unlock(ReentrantLock lock, DynamicObject thread, RubyNode
                 }
             }
 
-            ThreadNodes.releasedLock(thread, lock);
+            Layouts.THREAD.getOwnedLocks(thread).remove(lock);
         }
 
     }
@@ -210,7 +210,7 @@ public long doSleepMillis(DynamicObject mutex, long durationInMillis) {
             // Here we do it before unlocking for providing nice semantics for
             // thread1: mutex.sleep
             // thread2: mutex.synchronize { <ensured that thread1 is sleeping and thread1.wakeup will wake it up> }
-            ThreadNodes.shouldWakeUp(thread);
+            Layouts.THREAD.getWakeUp(thread).getAndSet(false);
 
             UnlockNode.unlock(lock, thread, this);
             try {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
@@ -208,7 +208,7 @@ public static Object matchCommon(DynamicObject regexp, DynamicObject source, boo
     public static void setThread(DynamicObject regexp, String name, Object value) {
         assert RubyGuards.isRubyRegexp(regexp);
         assert value != null;
-        ThreadNodes.getThreadLocals(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(regexp)).getContext().getThreadManager().getCurrentThread()).define(name, value, 0);
+        Layouts.THREAD.getThreadLocals(Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(regexp)).getContext().getThreadManager().getCurrentThread()).define(name, value, 0);
     }
 
     @TruffleBoundary