Remove start from ThreadLike since only Ruby threads can start

This also calls start on the native thread directly, rather than by traversing the native thread object.
jruby · Apr 14, 2020 · 0c8b19d · 0c8b19d
1 parent f46024f
commit 0c8b19d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -620,9 +620,12 @@ private Thread startThread(ThreadContext context, Runnable runnable) throws Rais
         try {
             Thread thread = new Thread(runnable);
             thread.setDaemon(true);
+
             this.file = context.getFile();
             this.line = context.getLine();
+
             initThreadName(runtime, thread, file, line);
+
             threadImpl = new RubyNativeThread(this, thread);
 
             addToCorrectThreadGroup(context);
@@ -633,6 +636,7 @@ private Thread startThread(ThreadContext context, Runnable runnable) throws Rais
             // copy parent thread's interrupt masks
             copyInterrupts(context, context.getThread().interruptMaskStack, this.interruptMaskStack);
 
+            // start the native thread
             thread.start();
 
             // We yield here to hopefully permit the target thread to schedule

diff --git a/core/src/main/java/org/jruby/internal/runtime/AdoptedNativeThread.java b/core/src/main/java/org/jruby/internal/runtime/AdoptedNativeThread.java
@@ -45,10 +45,6 @@ public AdoptedNativeThread(RubyThread rubyThread, Thread nativeThread) {
         this.nativeThread = new WeakReference<>(nativeThread);
     }
 
-    public void start() {
-        throw new RuntimeException("BUG: can't start an adopted thread");
-    }
-
     public void interrupt() {
         Thread thread = getThread();
         if (thread != null) thread.interrupt();

diff --git a/core/src/main/java/org/jruby/internal/runtime/RubyNativeThread.java b/core/src/main/java/org/jruby/internal/runtime/RubyNativeThread.java
@@ -49,10 +49,6 @@ public RubyNativeThread(RubyThread rubyThread, Thread nativeThread) {
         this.rubyName = null;
     }
 
-    public void start() {
-        thread.start();
-    }
-
     public void interrupt() {
         thread.interrupt();
     }

diff --git a/core/src/main/java/org/jruby/internal/runtime/ThreadLike.java b/core/src/main/java/org/jruby/internal/runtime/ThreadLike.java
@@ -31,8 +31,6 @@
 import java.util.concurrent.ExecutionException;
 
 public interface ThreadLike {
-    public void start();
-
     public void interrupt();
 
     public boolean isAlive();
@@ -58,9 +56,6 @@ public interface ThreadLike {
     public String getReportName();
 
     ThreadLike DUMMY = new ThreadLike() {
-        @Override
-        public void start() {}
-
         @Override
         public void interrupt() {}