[GR-30217] Update Sulong to get dlsym(RTLD_DEFAULT, symbol) support

PullRequest: truffleruby/2698

Author: eregon

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "f99631396f42d8f1b8850cf5efc34f136cdef8ff",
+                "version": "e9ddfb90978a31231e16aae7880c3d2b57a63ea3",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "f99631396f42d8f1b8850cf5efc34f136cdef8ff",
+                "version": "e9ddfb90978a31231e16aae7880c3d2b57a63ea3",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/core/fiber/FiberManager.java

@@ -316,9 +316,8 @@ public void start(RubyFiber fiber, Thread javaThread) {
 
         if (Thread.currentThread() == javaThread) {
             context.getThreadManager().rubyFiber.set(fiber);
-        }
-        if (!threadManager.isRubyManagedThread(javaThread)) {
-            context.getThreadManager().rubyFiberForeignMap.put(javaThread, fiber);
+        } else {
+            context.getThreadManager().javaThreadToRubyFiber.put(javaThread, fiber);
         }
 
         fiber.thread = javaThread;
@@ -345,7 +344,7 @@ public void cleanup(RubyFiber fiber, Thread javaThread) {
         if (Thread.currentThread() == javaThread) {
             threadManager.rubyFiber.remove();
         }
-        threadManager.rubyFiberForeignMap.remove(javaThread);
+        threadManager.javaThreadToRubyFiber.remove(javaThread);
 
         fiber.finishedLatch.countDown();
     }

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -77,11 +77,12 @@ public class ThreadManager {
 
     private final Set<RubyThread> runningRubyThreads = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
+    /** The set of Java threads TruffleRuby created, and is responsible to exit in {@link #killAndWaitOtherThreads()} */
     private final Set<Thread> rubyManagedThreads = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
-    public final Map<Thread, RubyFiber> rubyFiberForeignMap = new ConcurrentHashMap<>();
+    public final Map<Thread, RubyFiber> javaThreadToRubyFiber = new ConcurrentHashMap<>();
     public final ThreadLocal<RubyFiber> rubyFiber = ThreadLocal
-            .withInitial(() -> rubyFiberForeignMap.get(Thread.currentThread()));
+            .withInitial(() -> javaThreadToRubyFiber.get(Thread.currentThread()));
 
     private boolean nativeInterrupt;
     private Timer nativeInterruptTimer;
@@ -116,13 +117,11 @@ public void dispose() {
 
     public void initializeMainThread(Thread mainJavaThread) {
         rootJavaThread = mainJavaThread;
-        rubyManagedThreads.add(rootJavaThread);
         start(rootThread, rootJavaThread);
     }
 
     public void resetMainThread() {
         cleanup(rootThread, rootJavaThread);
-        rubyManagedThreads.remove(rootJavaThread);
         rootJavaThread = null;
     }