Don't start the virtual threads yet

DuncteBot · Dec 15, 2023 · ce7049f · ce7049f
1 parent 44a04ed
commit ce7049f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
@@ -100,7 +100,7 @@ public class CommandManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(CommandManager.class);
     private static final Pattern COMMAND_PATTERN = Pattern.compile("([^\"]\\S*|\".+?\")\\s*");
     private final ExecutorService commandThread = Executors.newThreadPerTaskExecutor(
-        (r) -> Thread.ofVirtual().name("Command-execute-thread").start(r)
+        (r) -> Thread.ofVirtual().name("Command-execute-thread").unstarted(r)
     );
     private final Map<String, ICommand<CommandContext>> commands = new ConcurrentHashMap<>();
     private final Map<String, String> aliases = new ConcurrentHashMap<>();

diff --git a/bot/src/main/java/ml/duncte123/skybot/EventManager.java b/bot/src/main/java/ml/duncte123/skybot/EventManager.java
@@ -49,7 +49,7 @@ public class EventManager implements IEventManager {
     private final List<EventListener> listeners = new ArrayList<>();
 
     private final ExecutorService eventExecutor = Executors.newThreadPerTaskExecutor(
-        (r) -> Thread.ofVirtual().name("Dunctebot-Event-Thread").start(r)
+        (r) -> Thread.ofVirtual().name("Dunctebot-Event-Thread").unstarted(r)
     );
 
     /* package */ EventManager(Variables variables) {

diff --git a/bot/src/main/java/ml/duncte123/skybot/listeners/BaseListener.java b/bot/src/main/java/ml/duncte123/skybot/listeners/BaseListener.java
@@ -29,9 +29,8 @@
 
 public abstract class BaseListener implements EventListener {
     protected static final Logger LOGGER = LoggerFactory.getLogger(BaseListener.class);
-    // TODO: use a scheduler instead
     protected final ExecutorService handlerThread = Executors.newThreadPerTaskExecutor(
-        (r) -> Thread.ofVirtual().name("Listener-handle-thread").start(r)
+        (r) -> Thread.ofVirtual().name("Listener-handle-thread").unstarted(r)
     );
     protected final Variables variables;
     // A list of servers that list bots

diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/eval/EvalCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/eval/EvalCommand.kt
@@ -43,7 +43,7 @@ class EvalCommand : Command() {
     private val evalThread = Executors.newThreadPerTaskExecutor {
         Thread.ofVirtual()
             .name("eval-thread")
-            .start(it)
+            .unstarted(it)
     }
 
     private val engine: ScriptEngine by lazy {

diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt b/bot/src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt
@@ -43,7 +43,7 @@ class WebSocketClient(
     private val executor = Executors.newThreadPerTaskExecutor {
         Thread.ofVirtual()
             .name("DB-SendThread")
-            .start(it)
+            .unstarted(it)
     }
 
     private val reconnectThread = Executors.newSingleThreadScheduledExecutor {

diff --git a/dashboard/src/main/kotlin/com/dunctebot/dashboard/websocket/WebsocketClient.kt b/dashboard/src/main/kotlin/com/dunctebot/dashboard/websocket/WebsocketClient.kt
@@ -26,7 +26,7 @@ class WebsocketClient(app: Javalin) : WebSocketAdapter(), WebSocketListener {
     val handlersMap = mutableMapOf<String, SocketHandler>()
 
     private val executor = Executors.newThreadPerTaskExecutor {
-        Thread.ofVirtual().name("WS-SendThread").start(it)
+        Thread.ofVirtual().name("WS-SendThread").unstarted(it)
     }
 
     private val reconnectThread = Executors.newSingleThreadScheduledExecutor {

diff --git a/shared/src/main/kotlin/ml/duncte123/skybot/database/AbstractDatabase.kt b/shared/src/main/kotlin/ml/duncte123/skybot/database/AbstractDatabase.kt
@@ -28,9 +28,9 @@ import ml.duncte123.skybot.objects.command.CustomCommand
 import java.time.ZonedDateTime
 import java.util.concurrent.*
 
-abstract class AbstractDatabase() : AutoCloseable {
+abstract class AbstractDatabase : AutoCloseable {
     private val databaseThread = Executors.newThreadPerTaskExecutor{
-        Thread.ofVirtual().name("DatabaseThread").start(it)
+        Thread.ofVirtual().name("DatabaseThread").unstarted(it)
     }
     private val databaseKiller = Executors.newSingleThreadScheduledExecutor {
         val t = Thread(it, "Database-kill-Thread")