Cleanup

Author: eregon

spec/ruby/optional/capi/ext/thread_spec.c

@@ -69,7 +69,7 @@ static VALUE thread_spec_rb_thread_call_without_gvl(VALUE self) {
 }
 
 /* This is unblocked by a signal. */
-static void* blocking_gvl_func_for_udf_io(void *data) {
+static void* blocking_gvl_func_for_ubf_io(void *data) {
   int rfd = (int)(size_t)data;
   char dummy;
 
@@ -89,7 +89,7 @@ static VALUE thread_spec_rb_thread_call_without_gvl_with_ubf_io(VALUE self) {
     rb_raise(rb_eRuntimeError, "could not create pipe");
   }
 
-  ret = rb_thread_call_without_gvl(blocking_gvl_func_for_udf_io,
+  ret = rb_thread_call_without_gvl(blocking_gvl_func_for_ubf_io,
                                   (void*)(size_t)fds[0], RUBY_UBF_IO, 0);
   close(fds[0]);
   close(fds[1]);

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

@@ -669,12 +669,13 @@ static Object call(
                 @Cached TranslateInteropExceptionNode translateInteropExceptionNode,
                 @Bind("this") Node node,
                 @Cached("new(node, receivers, translateInteropExceptionNode)") BlockingCallInterruptible blockingCallInterruptible) {
-            final ThreadManager threadManager = getContext(node).getThreadManager();
+            var context = getContext(node);
+            final ThreadManager threadManager = context.getThreadManager();
             final Interrupter interrupter;
             if (unblocker == nil) {
                 interrupter = threadManager.getNativeCallInterrupter();
             } else {
-                interrupter = makeInterrupter(getContext(node), unblockWrapper, unblocker, unblockerArg);
+                interrupter = new CExtInterrupter(context, unblockWrapper, unblocker, unblockerArg);
             }
 
             final Object[] args = { function, arg };
@@ -687,12 +688,6 @@ static Object call(
                     node);
         }
 
-        @TruffleBoundary
-        private static Interrupter makeInterrupter(RubyContext context, Object wrapper, Object function,
-                Object argument) {
-            return new CExtInterrupter(context, wrapper, function, argument);
-        }
-
         private static final class CExtInterrupter implements Interrupter {
 
             private final RubyContext context;
@@ -721,7 +716,6 @@ public void interrupt(Thread thread) {
                         }
                         prev = truffleContext.enter(null);
                     } catch (IllegalStateException e) { // Multi threaded access denied from Truffle
-                        // Not in a context, so we cannot use TruffleLogger
                         context.getLogger().severe(
                                 "could not unblock thread inside blocking call in C extension because " +
                                         "the context does not allow multithreading (" + e.getMessage() + ")");