new: fully threaded scheduling

Author: ishland

FlowSched

@@ -5,11 +5,11 @@
 import com.ishland.c2me.base.common.scheduler.SchedulingManager;
 import com.ishland.c2me.base.mixin.access.IThreadedAnvilChunkStorage;
 import com.ishland.c2me.base.mixin.access.IVersionedChunkStorage;
-import com.ishland.flowsched.scheduler.DaemonizedStatusAdvancingScheduler;
 import com.ishland.flowsched.scheduler.ExceptionHandlingAction;
 import com.ishland.flowsched.scheduler.ItemHolder;
 import com.ishland.flowsched.scheduler.ItemStatus;
 import com.ishland.flowsched.scheduler.KeyStatusPair;
+import com.ishland.flowsched.scheduler.StatusAdvancingScheduler;
 import com.ishland.flowsched.util.Assertions;
 import io.netty.util.internal.PlatformDependent;
 import io.reactivex.rxjava3.core.Scheduler;
@@ -21,49 +21,35 @@
 import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ServerChunkLoadingManager;
-import net.minecraft.util.Util;
 import net.minecraft.util.collection.BoundedRegionArray;
-import net.minecraft.util.crash.CrashException;
-import net.minecraft.util.crash.ReportType;
 import net.minecraft.util.math.ChunkPos;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.file.Path;
 import java.util.Queue;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ThreadFactory;
 
-public class TheChunkSystem extends DaemonizedStatusAdvancingScheduler<ChunkPos, ChunkState, ChunkLoadingContext, NewChunkHolderVanillaInterface> {
+public class TheChunkSystem extends StatusAdvancingScheduler<ChunkPos, ChunkState, ChunkLoadingContext, NewChunkHolderVanillaInterface> {
 
     private final Logger LOGGER;
 
     private final Long2IntMap managedTickets = Long2IntMaps.synchronize(new Long2IntOpenHashMap());
     private final SchedulingManager schedulingManager;
     private final Executor backingBackgroundExecutor = GlobalExecutors.prioritizedScheduler.executor(15);
-    private Queue<Runnable> backgroundTaskQueue = PlatformDependent.newSpscQueue();
-    private final Executor backgroundExecutor = command -> {
-        if (Thread.currentThread() != this.thread) {
-            command.run();
-        } else {
-            backgroundTaskQueue.add(command);
-        }
-    };
-    private final Scheduler backgroundScheduler = Schedulers.from(this.backgroundExecutor);
+    private final Scheduler backgroundScheduler = Schedulers.from(this.backingBackgroundExecutor);
     private final ServerChunkLoadingManager tacs;
 
-    public TheChunkSystem(ThreadFactory threadFactory, ServerChunkLoadingManager tacs) {
-        super(threadFactory, TheSpeedyObjectFactory.INSTANCE);
+    public TheChunkSystem(ServerChunkLoadingManager tacs) {
+        super(TheSpeedyObjectFactory.INSTANCE);
         this.tacs = tacs;
         this.schedulingManager =  ((IVanillaChunkManager) tacs).c2me$getSchedulingManager();
         this.LOGGER = LoggerFactory.getLogger("Chunk System of %s".formatted(((IThreadedAnvilChunkStorage) tacs).getWorld().getRegistryKey().getValue()));
         managedTickets.defaultReturnValue(NewChunkStatus.vanillaLevelToStatus.length - 1);
-        this.thread.start();
     }
 
     @Override
     protected Executor getBackgroundExecutor() {
-        return this.backgroundExecutor;
+        return this.backingBackgroundExecutor;
     }
 
     @Override
@@ -216,24 +202,4 @@ protected void onItemDowngrade(ItemHolder<ChunkPos, ChunkState, ChunkLoadingCont
     public int vanillaIf$getManagedLevel(long pos) {
         return this.managedTickets.get(pos);
     }
-
-    @Override
-    public boolean tick() {
-        boolean tick = super.tick();
-        if (!this.backgroundTaskQueue.isEmpty()) {
-            Queue<Runnable> queue = this.backgroundTaskQueue;
-            this.backgroundTaskQueue = PlatformDependent.newSpscQueue();
-            this.backingBackgroundExecutor.execute(() -> {
-                Runnable runnable;
-                while ((runnable = queue.poll()) != null) {
-                    try {
-                        runnable.run();
-                    } catch (Throwable t) {
-                        t.printStackTrace();
-                    }
-                }
-            });
-        }
-        return tick;
-    }
 }

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/TheChunkSystem.java

@@ -1,6 +1,5 @@
 package com.ishland.c2me.rewrites.chunksystem.mixin;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.ishland.c2me.base.common.scheduler.IVanillaChunkManager;
 import com.ishland.c2me.rewrites.chunksystem.common.ChunkLoadingContext;
 import com.ishland.c2me.rewrites.chunksystem.common.ChunkState;
@@ -39,9 +38,6 @@ public class MixinThreadedAnvilChunkStorage implements IChunkSystemAccess {
     @Inject(method = "<init>", at = @At("RETURN"))
     private void onInit(CallbackInfo ci) {
         newSystem = new TheChunkSystem(
-                new ThreadFactoryBuilder()
-                        .setNameFormat("chunksystem-" + this.world.getRegistryKey().getValue().toUnderscoreSeparatedString())
-                        .build(),
                 (ServerChunkLoadingManager) (Object) this
         );
     }
@@ -92,10 +88,10 @@ public ChunkHolder getChunkHolder(long pos) {
         return this.getCurrentChunkHolder(pos);
     }
 
-    @Inject(method = "close", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/poi/PointOfInterestStorage;close()V", shift = At.Shift.AFTER))
-    private void closeNewSystem(CallbackInfo ci) {
-        this.newSystem.shutdown();
-    }
+//    @Inject(method = "close", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/poi/PointOfInterestStorage;close()V", shift = At.Shift.AFTER))
+//    private void closeNewSystem(CallbackInfo ci) {
+//        this.newSystem.shutdown();
+//    }
 
     @Redirect(method = "save(Lnet/minecraft/world/chunk/Chunk;)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/ChunkStatus;getChunkType()Lnet/minecraft/world/chunk/ChunkType;"), require = 0)
     private ChunkType alwaysSaveChunk(ChunkStatus instance) {