[GR-45490] Follow-up for "Fix IO#wait specs transient failure"

PullRequest: truffleruby/4212

Author: andrykonchin

src/main/java/org/truffleruby/core/symbol/CoreSymbols.java

@@ -47,6 +47,11 @@ public final class CoreSymbols {
     public final RubySymbol DECONSTRUCT = createRubySymbol("deconstruct");
     public final RubySymbol DECONSTRUCT_KEYS = createRubySymbol("deconstruct_keys");
 
+    public final RubySymbol RUN = createRubySymbol("run");
+    public final RubySymbol SLEEP = createRubySymbol("sleep");
+    public final RubySymbol ABORTING = createRubySymbol("aborting");
+    public final RubySymbol DEAD = createRubySymbol("dead");
+
     // Added to workaround liquid's no symbols leaked test (SecurityTest#test_does_not_permanently_add_filters_to_symbol_table)
     public final RubySymbol IMMEDIATE_SWEEP = createRubySymbol("immediate_sweep");
     public final RubySymbol IMMEDIATE_MARK = createRubySymbol("immediate_mark");

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

@@ -82,8 +82,8 @@
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.string.RubyString;
-import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.support.RubyPRNGRandomizer;
+import org.truffleruby.core.symbol.CoreSymbols;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.core.thread.ThreadManager.BlockingCallInterruptible;
 import org.truffleruby.interop.ForeignToRubyNode;
@@ -580,35 +580,34 @@ Object status(RubyThread self) {
                     return false;
                 }
             }
-            return createString(fromJavaStringNode, StringUtils.toLowerCase(status.name()), Encodings.US_ASCII); // CR_7BIT
+
+            RubySymbol nameSymbol = threadStatusToRubySymbol(status, coreSymbols());
+            return createString(nameSymbol.tstring, nameSymbol.encoding);
         }
 
     }
 
     @Primitive(name = "thread_set_status")
     public abstract static class ThreadSetStatusPrimitiveNode extends PrimitiveArrayArgumentsNode {
 
-        @TruffleBoundary
         @Specialization
         Object threadSetStatus(RubyThread thread, RubySymbol status) {
-            ThreadStatus current = thread.status;
-            String newName = status.getString();
+            ThreadStatus previous = thread.status;
 
-            if (newName.equals("run")) {
+            if (status == coreSymbols().RUN) {
                 thread.status = ThreadStatus.RUN;
-            } else if (newName.equals("sleep")) {
+            } else if (status == coreSymbols().SLEEP) {
                 thread.status = ThreadStatus.SLEEP;
-            } else if (newName.equals("aborting")) {
+            } else if (status == coreSymbols().ABORTING) {
                 thread.status = ThreadStatus.ABORTING;
-            } else if (newName.equals("dead")) {
+            } else if (status == coreSymbols().DEAD) {
                 thread.status = ThreadStatus.DEAD;
             } else {
-                throw new RaiseException(getContext(),
-                        coreExceptions().argumentError("Unknown thread status: " + newName, this));
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw CompilerDirectives.shouldNotReachHere("Unknown thread status: " + status.getString());
             }
 
-            String currentName = StringUtils.toLowerCase(current.name());
-            return getLanguage().getSymbol(currentName);
+            return threadStatusToRubySymbol(previous, coreSymbols());
         }
     }
 
@@ -1083,4 +1082,24 @@ Object eachCallerLocation(VirtualFrame frame, Nil block) {
             throw new RaiseException(getContext(), coreExceptions().localJumpError("no block given", this));
         }
     }
+
+    private static RubySymbol threadStatusToRubySymbol(ThreadStatus status, CoreSymbols coreSymbols) {
+        final RubySymbol symbol;
+
+        if (status == ThreadStatus.RUN) {
+            symbol = coreSymbols.RUN;
+        } else if (status == ThreadStatus.SLEEP) {
+            symbol = coreSymbols.SLEEP;
+        } else if (status == ThreadStatus.ABORTING) {
+            symbol = coreSymbols.ABORTING;
+        } else if (status == ThreadStatus.DEAD) {
+            symbol = coreSymbols.DEAD;
+        } else {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            throw CompilerDirectives.shouldNotReachHere("Unknown thread status: " + status);
+        }
+
+        return symbol;
+    }
+
 }

src/main/ruby/truffleruby/core/truffle/io_operations.rb

@@ -263,8 +263,12 @@ def self.poll(io, event_mask, timeout)
         # Don't mark Truffle::POSIX.truffleposix_poll_single_fd as blocking because
         # then it would automatically retry on EINTR without considering/adjusting the timeout.
         status = Primitive.thread_set_status(Thread.current, :sleep)
-        returned_events = Truffle::POSIX.truffleposix_poll_single_fd(Primitive.io_fd(io), event_mask, remaining_timeout)
-        Primitive.thread_set_status(Thread.current, status)
+
+        begin
+          returned_events = Truffle::POSIX.truffleposix_poll_single_fd(Primitive.io_fd(io), event_mask, remaining_timeout)
+        ensure
+          Primitive.thread_set_status(Thread.current, status)
+        end
 
         result =
           if returned_events < 0

tool/generate-core-symbols.rb

@@ -66,6 +66,11 @@
     public final RubySymbol DECONSTRUCT = createRubySymbol("deconstruct");
     public final RubySymbol DECONSTRUCT_KEYS = createRubySymbol("deconstruct_keys");
 
+    public final RubySymbol RUN = createRubySymbol("run");
+    public final RubySymbol SLEEP = createRubySymbol("sleep");
+    public final RubySymbol ABORTING = createRubySymbol("aborting");
+    public final RubySymbol DEAD = createRubySymbol("dead");
+
     // Added to workaround liquid's no symbols leaked test (SecurityTest#test_does_not_permanently_add_filters_to_symbol_table)
     public final RubySymbol IMMEDIATE_SWEEP = createRubySymbol("immediate_sweep");
     public final RubySymbol IMMEDIATE_MARK = createRubySymbol("immediate_mark");