[GR-31421] Move RUBY_DEFAULT_HANDLERS to RubyContext

PullRequest: truffleruby/2658

Author: bjfish

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

@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 
@@ -94,6 +95,7 @@
 import com.oracle.truffle.api.instrumentation.Instrumenter;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.source.Source;
+import sun.misc.SignalHandler;
 
 public class RubyContext {
 
@@ -132,6 +134,8 @@ public class RubyContext {
     /** (Symbol, refinements) -> Proc for Symbol#to_proc */
     public final Map<Pair<RubySymbol, Map<RubyModule, RubyModule[]>>, RootCallTarget> cachedSymbolToProcTargetsWithRefinements = new ConcurrentHashMap<>();
     private final Map<ImmutableRubyString, NativeRope> immutableNativeRopes = new ConcurrentHashMap<>();
+    /** Default signal handlers for Ruby, only SIGINT and SIGALRM, see {@code core/main.rb} */
+    public final ConcurrentMap<String, SignalHandler> defaultRubySignalHandlers = new ConcurrentHashMap<>();
 
     @CompilationFinal private SecureRandom random;
     private final Hashing hashing;

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

@@ -294,7 +294,7 @@ private boolean restoreDefaultHandler(String signalName) {
             }
 
             try {
-                return Signals.restoreRubyDefaultHandler(signalName);
+                return Signals.restoreRubyDefaultHandler(getContext(), signalName);
             } catch (IllegalArgumentException e) {
                 throw new RaiseException(getContext(), coreExceptions().argumentError(e.getMessage(), this));
             }
@@ -341,7 +341,7 @@ private boolean registerHandler(String signalName, SignalHandler newHandler, boo
             }
 
             try {
-                Signals.registerHandler(newHandler, signalName, isRubyDefaultHandler);
+                Signals.registerHandler(getContext(), newHandler, signalName, isRubyDefaultHandler);
             } catch (IllegalArgumentException e) {
                 throw new RaiseException(getContext(), coreExceptions().argumentError(e.getMessage(), this));
             }

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

@@ -13,6 +13,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import org.truffleruby.RubyContext;
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
 
@@ -26,15 +27,14 @@ public class Signals {
     // Use String and not Signal as key to work around SVM not allowing new Signal("PROF")
     /** Default SignalHandlers for the JVM */
     private static final ConcurrentMap<String, SignalHandler> DEFAULT_HANDLERS = new ConcurrentHashMap<>();
-    /** Default signal handlers for Ruby, only SIGINT and SIGALRM, see {@code core/main.rb} */
-    private static final ConcurrentMap<String, SignalHandler> RUBY_DEFAULT_HANDLERS = new ConcurrentHashMap<>();
 
-    public static void registerHandler(SignalHandler newHandler, String signalName, boolean isRubyDefaultHandler) {
+    public static void registerHandler(RubyContext context, SignalHandler newHandler, String signalName,
+            boolean isRubyDefaultHandler) {
         final Signal signal = new Signal(signalName);
         final SignalHandler oldHandler = Signal.handle(signal, newHandler);
         DEFAULT_HANDLERS.putIfAbsent(signalName, oldHandler);
         if (isRubyDefaultHandler) {
-            RUBY_DEFAULT_HANDLERS.putIfAbsent(signalName, newHandler);
+            context.defaultRubySignalHandlers.putIfAbsent(signalName, newHandler);
         }
     }
 
@@ -56,8 +56,8 @@ public static boolean restoreDefaultHandler(String signalName) {
         }
     }
 
-    public static boolean restoreRubyDefaultHandler(String signalName) {
-        SignalHandler defaultHandler = RUBY_DEFAULT_HANDLERS.get(signalName);
+    public static boolean restoreRubyDefaultHandler(RubyContext context, String signalName) {
+        SignalHandler defaultHandler = context.defaultRubySignalHandlers.get(signalName);
         if (defaultHandler == null) {
             defaultHandler = DEFAULT_HANDLERS.get(signalName);
         }