[Truffle] No more global lock!

jruby · Jul 17, 2015 · 087113a · 087113a
1 parent a228b5f
commit 087113a
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java
@@ -21,7 +21,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Manages Ruby {@code Thread} objects.
@@ -30,10 +29,8 @@ public class ThreadManager {
 
     private final RubyContext context;
 
-    private final ReentrantLock globalLock = new ReentrantLock();
-
     private final RubyThread rootThread;
-    private RubyThread currentThread;
+    private final ThreadLocal<RubyThread> currentThread = new ThreadLocal<RubyThread>();
 
     private final Set<RubyThread> runningRubyThreads = Collections.newSetFromMap(new ConcurrentHashMap<RubyThread, Boolean>());
 
@@ -61,8 +58,7 @@ public RubyThread getRootThread() {
      */
     @TruffleBoundary
     public void enterGlobalLock(RubyThread thread) {
-        globalLock.lock();
-        currentThread = thread;
+        currentThread.set(thread);
     }
 
     /**
@@ -73,13 +69,7 @@ public void enterGlobalLock(RubyThread thread) {
      */
     @TruffleBoundary
     public RubyThread leaveGlobalLock() {
-        if (!globalLock.isHeldByCurrentThread()) {
-            throw new RuntimeException("You don't own this lock!");
-        }
-
-        final RubyThread result = currentThread;
-        globalLock.unlock();
-        return result;
+        return currentThread.get();
     }
 
     public static interface BlockingActionWithoutGlobalLock<T> {
@@ -122,8 +112,7 @@ public <T> T runUntilResult(BlockingActionWithoutGlobalLock<T> action) {
     }
 
     public RubyThread getCurrentThread() {
-        assert globalLock.isHeldByCurrentThread() : "getCurrentThread() is only correct if holding the global lock";
-        return currentThread;
+        return currentThread.get();
     }
 
     public synchronized void registerThread(RubyThread thread) {