[GR-15990] Remove some global references to the RubyContext

PullRequest: truffleruby/2411

Author: eregon

src/main/java/org/truffleruby/RubyContext.java

@@ -78,6 +78,7 @@
 import org.truffleruby.options.Options;
 import org.truffleruby.parser.TranslatorDriver;
 import org.truffleruby.platform.NativeConfiguration;
+import org.truffleruby.platform.Signals;
 import org.truffleruby.platform.TruffleNFIPlatform;
 import org.truffleruby.shared.Metrics;
 import org.truffleruby.shared.TruffleRuby;
@@ -518,6 +519,8 @@ private void dispose() {
         threadManager.cleanupMainThread();
         safepointManager.checkNoRunningThreads();
 
+        Signals.restoreDefaultHandlers();
+
         if (options.ROPE_PRINT_INTERN_STATS) {
             RubyLanguage.LOGGER.info("ropes re-used: " + language.ropeCache.getRopesReusedCount());
             RubyLanguage.LOGGER.info("rope byte arrays re-used: " + language.ropeCache.getByteArrayReusedCount());

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

@@ -534,7 +534,6 @@ UnblockingAction getNativeCallUnblockingAction() {
     }
 
     public void initializeValuesForJavaThread(RubyThread rubyThread, Thread thread) {
-
         if (Thread.currentThread() == thread) {
             currentThread.set(rubyThread);
         }
@@ -557,6 +556,10 @@ public void cleanupValuesForJavaThread(Thread thread) {
         }
         foreignThreadMap.remove(thread);
 
+        if (pthread_self != null) {
+            blockingNativeCallUnblockingAction.remove();
+        }
+
         unblockingActions.remove(thread);
     }
 

src/main/java/org/truffleruby/platform/Signals.java

@@ -9,6 +9,7 @@
  */
 package org.truffleruby.platform;
 
+import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -33,7 +34,7 @@ public static void registerIgnoreHandler(String signalName) {
     }
 
     public static boolean restoreDefaultHandler(String signalName) {
-        final SignalHandler defaultHandler = Signals.DEFAULT_HANDLERS.get(signalName);
+        final SignalHandler defaultHandler = DEFAULT_HANDLERS.get(signalName);
         if (defaultHandler == null) {
             // it is already the default signal
             return false;
@@ -49,4 +50,10 @@ public static void restoreSystemHandler(String signalName) {
         Signal.handle(signal, SignalHandler.SIG_DFL);
     }
 
+    public static void restoreDefaultHandlers() {
+        for (String signalName : new ArrayList<>(DEFAULT_HANDLERS.keySet())) {
+            restoreDefaultHandler(signalName);
+        }
+    }
+
 }