Attempt to make MRI signal name/number idempotence test reliable.

jruby · Oct 24, 2017 · bad1e15 · bad1e15
1 parent 7cf25e8
commit bad1e15
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubySignal.java b/core/src/main/java/org/jruby/RubySignal.java
@@ -97,11 +97,21 @@ public static Map<String, Integer> list() {
     @JRubyMethod(meta = true)
     public static IRubyObject list(ThreadContext context, IRubyObject recv) {
         Ruby runtime = recv.getRuntime();
-        RubyHash names = RubyHash.newHash(runtime);
-        for (Map.Entry<String, Integer> sig : RubySignal.list().entrySet()) {
-            names.op_aset(context, runtime.newString(sig.getKey()), runtime.newFixnum(sig.getValue()));
+        RubyHash names;
+
+        synchronized (recv) {
+            names = (RubyHash) recv.getInternalVariables().getInternalVariable("signal_list");
+            if (names == null) {
+                names = RubyHash.newHash(runtime);
+                for (Map.Entry<String, Integer> sig : RubySignal.list().entrySet()) {
+                    names.op_aset(context, runtime.freezeAndDedupString(runtime.newString(sig.getKey())), runtime.newFixnum(sig.getValue()));
+                }
+                names.op_aset(context, runtime.freezeAndDedupString(runtime.newString("EXIT")), runtime.newFixnum(0));
+            } else {
+                names.dup(context);
+            }
         }
-        names.op_aset(context, runtime.newString("EXIT"), runtime.newFixnum(0));
+
         return names;
     }