Merge branch 'feature/split-computer-thread' into mc-1.20.x

cc-tweaked · Oct 19, 2023 · e3ced84 · e3ced84
2 parents e67c94d + 0929ab5
commit e3ced84
Show file tree

Hide file tree

Showing 12 changed files with 891 additions and 597 deletions.
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -112,7 +112,9 @@ SPDX-License-Identifier: MPL-2.0
         <module name="LambdaParameterName" />
         <module name="LocalFinalVariableName" />
         <module name="LocalVariableName" />
-        <module name="MemberName" />
+        <module name="MemberName">
+            <property name="format" value="^\$?[a-z][a-zA-Z0-9]*$" />
+        </module>
         <module name="MethodName">
             <property name="format" value="^(computercraft\$)?[a-z][a-zA-Z0-9]*$" />
         </module>
@@ -122,7 +124,7 @@ SPDX-License-Identifier: MPL-2.0
         </module>
         <module name="ParameterName" />
         <module name="StaticVariableName">
-            <property name="format" value="^[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$" />
         </module>
         <module name="TypeName" />
 

diff --git a/projects/core/src/main/java/dan200/computercraft/core/ComputerContext.java b/projects/core/src/main/java/dan200/computercraft/core/ComputerContext.java
@@ -8,8 +8,9 @@
 import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.asm.LuaMethodSupplier;
 import dan200.computercraft.core.asm.PeripheralMethodSupplier;
-import dan200.computercraft.core.computer.ComputerThread;
 import dan200.computercraft.core.computer.GlobalEnvironment;
+import dan200.computercraft.core.computer.computerthread.ComputerScheduler;
+import dan200.computercraft.core.computer.computerthread.ComputerThread;
 import dan200.computercraft.core.computer.mainthread.MainThreadScheduler;
 import dan200.computercraft.core.computer.mainthread.NoWorkMainThreadScheduler;
 import dan200.computercraft.core.lua.CobaltLuaMachine;
@@ -31,15 +32,15 @@
  */
 public final class ComputerContext {
     private final GlobalEnvironment globalEnvironment;
-    private final ComputerThread computerScheduler;
+    private final ComputerScheduler computerScheduler;
     private final MainThreadScheduler mainThreadScheduler;
     private final ILuaMachine.Factory luaFactory;
     private final List<ILuaAPIFactory> apiFactories;
     private final MethodSupplier<LuaMethod> luaMethods;
     private final MethodSupplier<PeripheralMethod> peripheralMethods;
 
     ComputerContext(
-        GlobalEnvironment globalEnvironment, ComputerThread computerScheduler,
+        GlobalEnvironment globalEnvironment, ComputerScheduler computerScheduler,
         MainThreadScheduler mainThreadScheduler, ILuaMachine.Factory luaFactory,
         List<ILuaAPIFactory> apiFactories, MethodSupplier<LuaMethod> luaMethods,
         MethodSupplier<PeripheralMethod> peripheralMethods
@@ -68,7 +69,7 @@ public GlobalEnvironment globalEnvironment() {
      *
      * @return The current computer thread manager.
      */
-    public ComputerThread computerScheduler() {
+    public ComputerScheduler computerScheduler() {
         return computerScheduler;
     }
 
@@ -162,7 +163,7 @@ public static Builder builder(GlobalEnvironment environment) {
      */
     public static class Builder {
         private final GlobalEnvironment environment;
-        private int threads = 1;
+        private @Nullable ComputerScheduler computerScheduler = null;
         private @Nullable MainThreadScheduler mainThreadScheduler;
         private @Nullable ILuaMachine.Factory luaFactory;
         private @Nullable List<ILuaAPIFactory> apiFactories;
@@ -173,15 +174,28 @@ public static class Builder {
         }
 
         /**
-         * Set the number of threads the {@link ComputerThread} will use.
+         * Set the {@link #computerScheduler()} to use {@link ComputerThread} with a given number of threads.
          *
          * @param threads The number of threads to use.
          * @return {@code this}, for chaining
          * @see ComputerContext#computerScheduler()
          */
         public Builder computerThreads(int threads) {
             if (threads < 1) throw new IllegalArgumentException("Threads must be >= 1");
-            this.threads = threads;
+            return computerScheduler(new ComputerThread(threads));
+        }
+
+        /**
+         * Set the {@link ComputerScheduler} for this context.
+         *
+         * @param scheduler The computer thread scheduler.
+         * @return {@code this}, for chaining
+         * @see ComputerContext#mainThreadScheduler()
+         */
+        public Builder computerScheduler(ComputerScheduler scheduler) {
+            Objects.requireNonNull(scheduler);
+            if (computerScheduler != null) throw new IllegalStateException("Computer scheduler already specified");
+            computerScheduler = scheduler;
             return this;
         }
 
@@ -250,7 +264,7 @@ public Builder genericMethods(Collection<GenericMethod> genericMethods) {
         public ComputerContext build() {
             return new ComputerContext(
                 environment,
-                new ComputerThread(threads),
+                computerScheduler == null ? new ComputerThread(1) : computerScheduler,
                 mainThreadScheduler == null ? new NoWorkMainThreadScheduler() : mainThreadScheduler,
                 luaFactory == null ? CobaltLuaMachine::new : luaFactory,
                 apiFactories == null ? List.of() : apiFactories,