NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove FlowSched and task bridgers

Browse Source
This commit is contained in:
MrHua269
2026-07-10 14:46:30 +08:00
parent e7c2ebfa06
commit 5957c4c799
11 changed files with 2 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camellia-server/build.gradle.kts.patch
+1 -2
View File
@@ -75,7 +75,7 @@
} }
} }
val log4jPlugins = sourceSets.create("log4jPlugins") { val log4jPlugins = sourceSets.create("log4jPlugins") {
@@ -134,7 +_,16 @@ @@ -134,7 +_,15 @@
} }
dependencies { dependencies {
@@ -88,7 +88,6 @@
+ implementation("net.openhft:zero-allocation-hashing:0.16") + implementation("net.openhft:zero-allocation-hashing:0.16")
+ implementation("net.objecthunter:exp4j:0.4.8") + implementation("net.objecthunter:exp4j:0.4.8")
+ implementation("io.github.classgraph:classgraph:4.8.158") + implementation("io.github.classgraph:classgraph:4.8.158")
+ implementation(project(":FlowSched"))
+ // Camellia end + // Camellia end
implementation("ca.spottedleaf:leafpile:1.0.0") implementation("ca.spottedleaf:leafpile:1.0.0")
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/AbstractPosAwarePrioritizedTask.java
-50
View File
@@ -1,50 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.ishland.flowsched.executor.Task;
import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
import java.util.Objects;
public abstract class AbstractPosAwarePrioritizedTask extends Task {
protected final ReferenceArrayList<Runnable> postExec = new ReferenceArrayList<>(4);
private final long pos;
public AbstractPosAwarePrioritizedTask(long pos) {
this.pos = pos;
}
public long getPos() {
return this.pos;
}
public void addPostExec(Runnable runnable) {
synchronized (this.postExec) {
postExec.add(Objects.requireNonNull(runnable));
}
}
}
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/LockTokenImpl.java
-90
View File
@@ -1,90 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.ishland.flowsched.executor.LockToken;
import java.util.Objects;
public final class LockTokenImpl implements LockToken {
private final int ownerTag;
private final long pos;
private final Usage usage;
public LockTokenImpl(int ownerTag, long pos, Usage usage) {
this.ownerTag = ownerTag;
this.pos = pos;
this.usage = usage;
}
public int ownerTag() {
return ownerTag;
}
public long pos() {
return pos;
}
public Usage usage() {
return usage;
}
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
if (obj == null || obj.getClass() != this.getClass()) return false;
var that = (LockTokenImpl) obj;
return this.ownerTag == that.ownerTag &&
this.pos == that.pos &&
Objects.equals(this.usage, that.usage);
}
@Override
public int hashCode() {
// inlined Objects.hash(ownerTag, usage, pos)
int result = 1;
result = 31 * result + Integer.hashCode(ownerTag);
result = 31 * result + usage.hashCode();
result = 31 * result + Long.hashCode(pos);
return result;
}
@Override
public String toString() {
return "LockTokenImpl[" +
"ownerTag=" + ownerTag + ", " +
"pos=" + pos + ", " +
"usage=" + usage + ']';
}
public enum Usage {
WORLDGEN,
LIGHTING,
}
}
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/ScheduledTask.java
-76
View File
@@ -1,76 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.ishland.flowsched.executor.LockToken;
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
public class ScheduledTask<T> extends AbstractPosAwarePrioritizedTask {
private final Supplier<CompletableFuture<T>> action;
private final LockToken[] lockTokens;
private final CompletableFuture<T> future = new CompletableFuture<>();
public ScheduledTask(long pos, Supplier<CompletableFuture<T>> action, LockToken[] lockTokens) {
super(pos);
this.action = action;
this.lockTokens = lockTokens;
}
@Override
public void run(Runnable releaseLocks) {
action.get().whenComplete((t, throwable) -> {
releaseLocks.run();
if (throwable != null) {
future.completeExceptionally(throwable);
} else {
future.complete(t);
}
for (Runnable runnable : this.postExec) {
try {
runnable.run();
} catch (Throwable t1) {
t1.printStackTrace();
}
}
});
}
@Override
public void propagateException(Throwable t) {
future.completeExceptionally(t);
}
@Override
public LockToken[] lockTokens() {
return this.lockTokens;
}
public CompletableFuture<T> getFuture() {
return this.future;
}
}
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SchedulingManager.java
-265
View File
@@ -1,265 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.ishland.flowsched.executor.ExecutorManager;
import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArraySet;
import net.minecraft.server.level.ChunkLevel;
import net.minecraft.world.level.ChunkPos;
import java.util.ArrayDeque;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.StampedLock;
public class SchedulingManager {
private static final AtomicInteger COUNTER = new AtomicInteger(0);
public static final int MAX_LEVEL = ChunkLevel.MAX_LEVEL + 1;
private final ConcurrentMap<Long, FreeableTaskList> pos2Tasks = new ConcurrentHashMap<>();
private final Long2IntOpenHashMap prioritiesFromLevel = new Long2IntOpenHashMap() {
@Override
protected void rehash(int newN) {
if (n < newN) {
super.rehash(newN);
}
}
};
private final StampedLock prioritiesLock = new StampedLock();
private final int id = COUNTER.getAndIncrement();
private volatile ChunkPos currentSyncLoad = null;
private boolean consolidatingLevelUpdates = false;
private Queue<Runnable> consolidatedLevelUpdates = new ArrayDeque<>();
private final Executor executor;
{
prioritiesFromLevel.defaultReturnValue(MAX_LEVEL);
}
private final ExecutorManager worker;
public SchedulingManager(Executor managementExecutor, ExecutorManager worker) {
this.executor = managementExecutor;
this.worker = worker;
}
public void enqueue(AbstractPosAwarePrioritizedTask task) {
retry:
while (true) {
final long pos = task.getPos();
final FreeableTaskList locks = this.pos2Tasks.computeIfAbsent(pos, unused -> new FreeableTaskList());
synchronized (locks) {
if (locks.freed) continue retry;
locks.add(task);
}
int priority = this.getPriority(pos);
task.addPostExec(() -> {
final FreeableTaskList tasks = this.pos2Tasks.get(task.getPos());
if (tasks != null) {
synchronized (tasks) {
if (tasks.freed) return;
tasks.remove(task);
if (tasks.isEmpty()) {
tasks.freed = true;
}
}
if (tasks.freed) {
this.pos2Tasks.remove(task.getPos());
}
}
});
this.worker.schedule(task, priority);
return;
}
}
public void enqueue(long pos, Runnable command) {
this.enqueue(new WrappingTask(pos, command));
}
public Executor positionedExecutor(long pos) {
return command -> this.enqueue(pos, command);
}
public void updatePriorityFromLevel(long pos, int level) {
this.executor.execute(() -> {
updatePriorityFromLevel0(pos, level);
});
}
private void updatePriorityFromLevel0(long pos, int level) {
if (this.getPriorityFromMap(pos) == level) return;
final long stamp = this.prioritiesLock.writeLock();
try {
if (level < MAX_LEVEL) {
this.prioritiesFromLevel.put(pos, level);
} else {
this.prioritiesFromLevel.remove(pos);
}
} finally {
this.prioritiesLock.unlockWrite(stamp);
}
updatePriorityInternal(pos);
}
public void updatePriorityFromLevelOnMain(long pos, int level) {
if (this.consolidatingLevelUpdates) {
this.consolidatedLevelUpdates.add(() -> updatePriorityFromLevel0(pos, level));
} else {
updatePriorityFromLevel(pos, level);
}
}
public void setConsolidatingLevelUpdates(boolean value) {
this.consolidatingLevelUpdates = value;
if (!value) {
if (!this.consolidatedLevelUpdates.isEmpty()) {
Queue<Runnable> runnables = this.consolidatedLevelUpdates;
this.consolidatedLevelUpdates = new ArrayDeque<>();
this.executor.execute(() -> {
for (Runnable runnable : runnables) {
try {
runnable.run();
} catch (Throwable t) {
t.printStackTrace();
}
}
});
}
}
}
private void updatePriorityInternal(long pos) {
final int priority = getPriority(pos);
final FreeableTaskList locks = this.pos2Tasks.get(pos);
if (locks != null) {
synchronized (locks) {
if (locks.freed) return;
for (AbstractPosAwarePrioritizedTask lock : locks) {
this.worker.changePriority(lock, priority);
}
}
}
}
public ExecutorManager getWorker() {
return this.worker;
}
private int getPriority(long pos) {
final int fromLevel = getPriorityFromMap(pos);
int fromSyncLoad;
ChunkPos currentSyncLoad1 = currentSyncLoad;
if (currentSyncLoad1 != null) {
final int chebyshevDistance = chebyshev(ChunkPos.unpack(pos), currentSyncLoad1);
if (chebyshevDistance <= 8) {
fromSyncLoad = chebyshevDistance;
// System.out.println("dist for chunk [%d,%d] is %d".formatted(currentSyncLoad.x, currentSyncLoad.z, chebyshevDistance));
} else {
fromSyncLoad = MAX_LEVEL;
}
} else {
fromSyncLoad = MAX_LEVEL;
}
return Math.min(fromLevel, fromSyncLoad);
}
private int getPriorityFromMap(long pos) {
int fromLevel = MAX_LEVEL;
long stamp = this.prioritiesLock.tryOptimisticRead();
try {
fromLevel = this.prioritiesFromLevel.get(pos);
} catch (Throwable t) {
}
if (!this.prioritiesLock.validate(stamp)) {
stamp = this.prioritiesLock.readLock();
try {
fromLevel = this.prioritiesFromLevel.get(pos);
} finally {
this.prioritiesLock.unlockRead(stamp);
}
}
return fromLevel;
}
public void setCurrentSyncLoad(ChunkPos pos) {
executor.execute(() -> {
if (this.currentSyncLoad != null) {
final ChunkPos lastSyncLoad = this.currentSyncLoad;
this.currentSyncLoad = null;
updateSyncLoadInternal(lastSyncLoad);
}
if (pos != null) {
this.currentSyncLoad = pos;
updateSyncLoadInternal(pos);
}
});
}
public int getId() {
return this.id;
}
private void updateSyncLoadInternal(ChunkPos pos) {
long startTime = System.nanoTime();
for (int xOff = -8; xOff <= 8; xOff++) {
for (int zOff = -8; zOff <= 8; zOff++) {
updatePriorityInternal(ChunkPos.pack(pos.x() + xOff, pos.z() + zOff));
}
}
long endTime = System.nanoTime();
}
private static int chebyshev(ChunkPos a, ChunkPos b) {
return Math.max(Math.abs(a.x() - b.x()), Math.abs(a.z() - b.z()));
}
private static int chebyshev(long a, long b) {
return Math.max(Math.abs(ChunkPos.getX(a) - ChunkPos.getX(b)), Math.abs(ChunkPos.getZ(a) - ChunkPos.getZ(b)));
}
private static class FreeableTaskList extends ObjectArraySet<AbstractPosAwarePrioritizedTask> {
private boolean freed = false;
@Override
public boolean equals(Object o) {
return this == o;
}
@Override
public int hashCode() {
return System.identityHashCode(this);
}
}
}
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SimplePrioritizedTask.java
-60
View File
@@ -1,60 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.ishland.flowsched.executor.LockToken;
import com.ishland.flowsched.executor.Task;
import java.util.Objects;
public class SimplePrioritizedTask extends Task {
private final Runnable task;
private final LockToken[] lockTokens;
public SimplePrioritizedTask(Runnable task, LockToken[] lockTokens) {
this.task = Objects.requireNonNull(task, "task");
this.lockTokens = Objects.requireNonNull(lockTokens, "lockTokens");
}
@Override
public void run(Runnable releaseLocks) {
try {
this.task.run();
} finally {
releaseLocks.run();
}
}
@Override
public void propagateException(Throwable t) {
t.printStackTrace();
}
@Override
public LockToken[] lockTokens() {
return this.lockTokens;
}
}
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/SingleThreadExecutor.java
-107
View File
@@ -1,107 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.google.common.base.Preconditions;
import io.netty.util.internal.PlatformDependent;
import org.jetbrains.annotations.NotNull;
import java.util.Queue;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.LockSupport;
public class SingleThreadExecutor extends Thread implements Executor {
private final AtomicInteger size = new AtomicInteger();
public final Queue<Runnable> queue = PlatformDependent.newMpscQueue();
private final AtomicBoolean shutdown = new AtomicBoolean(false);
private final Object sync = new Object();
@Override
public void run() {
main_loop:
while (true) {
if (pollTasks()) {
continue;
}
if (this.shutdown.get()) {
return;
}
// // attempt to spin-wait before sleeping
// if (!pollTasks()) {
// Thread.interrupted(); // clear interrupt flag
// for (int i = 0; i < 5000; i ++) {
// if (pollTasks()) continue main_loop;
// LockSupport.parkNanos("Spin-waiting for tasks", 10_000); // 100us
// }
// }
synchronized (sync) {
if (this.size.get() != 0 || this.shutdown.get()) continue main_loop;
try {
sync.wait();
} catch (InterruptedException ignored) {
}
}
}
}
private boolean pollTasks() {
boolean hasWork = false;
Runnable task;
while ((task = queue.poll()) != null) {
this.size.decrementAndGet();
try {
task.run();
} catch (Throwable t) {
t.printStackTrace();
}
hasWork = true;
}
return hasWork;
}
@Override
public void execute(@NotNull Runnable command) {
Preconditions.checkNotNull(command, "command");
final boolean wasEmpty = this.size.getAndIncrement() == 0;
this.queue.add(command);
if (wasEmpty) {
synchronized (sync) {
sync.notify();
}
}
}
public void shutdown() {
this.shutdown.set(true);
synchronized (sync) {
sync.notify();
}
}
}
camellia-server/src/main/java/com/ishland/c2me/base/common/scheduler/WrappingTask.java
-67
View File
@@ -1,67 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021-2026 ishland
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.ishland.c2me.base.common.scheduler;
import com.ishland.flowsched.executor.LockToken;
import java.util.Objects;
public class WrappingTask extends AbstractPosAwarePrioritizedTask {
private static final LockToken[] EMPTY_LOCK_TOKENS = new LockToken[0];
private final Runnable wrapped;
public WrappingTask(long pos, Runnable wrapped) {
super(pos);
this.wrapped = Objects.requireNonNull(wrapped);
}
@Override
public void run(Runnable releaseLocks) {
try {
wrapped.run();
} finally {
releaseLocks.run();
for (Runnable runnable : this.postExec) {
try {
runnable.run();
} catch (Throwable t1) {
t1.printStackTrace();
}
}
}
}
@Override
public void propagateException(Throwable t) {
t.printStackTrace();
}
@Override
public LockToken[] lockTokens() {
return EMPTY_LOCK_TOKENS;
}
}
camellia-server/src/main/java/moe/monnairealms/camellia/utils/tasks/FlowSchedRunnableTask2CUTask.java
-136
View File
@@ -1,136 +0,0 @@
package moe.monnairealms.camellia.utils.tasks;
import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
import ca.spottedleaf.concurrentutil.util.Priority;
import com.ishland.c2me.base.common.scheduler.SchedulingManager;
import com.ishland.flowsched.executor.SimpleTask;
public class FlowSchedRunnableTask2CUTask implements PrioritisedExecutor.PrioritisedTask {
private static final int STATE_CREATED = 0;
private static final int STATE_QUEUED = 1;
private static final int STATE_CANCELLED = 2;
private volatile int state;
private volatile Priority priority;
private final SimpleTask task;
private final SchedulingManager worker;
public FlowSchedRunnableTask2CUTask(Runnable task, SchedulingManager worker, Priority priority) {
this.worker = worker;
this.priority = priority;
this.task = new SimpleTask(task);
}
public FlowSchedRunnableTask2CUTask(Runnable task, SchedulingManager worker) {
this(task, worker, Priority.NORMAL);
}
@Override
public PrioritisedExecutor getExecutor() {
throw new UnsupportedOperationException();
}
@Override
public boolean queue() {
synchronized (this) {
if (this.state > STATE_CREATED) {
return false;
}
this.state = STATE_QUEUED;
this.worker.getWorker().schedule(this.task, this.priority.priority * 7);
return true;
}
}
@Override
public boolean isQueued() {
return this.state == STATE_QUEUED;
}
@Override
public boolean cancel() {
synchronized (this) {
if (this.state == STATE_CANCELLED || this.state == STATE_QUEUED) {
return false;
}
this.state = STATE_CANCELLED;
return true;
}
}
@Override
public Priority getPriority() {
return this.priority;
}
@Override
public boolean setPriority(Priority priority) {
synchronized (this) {
if (this.state == STATE_CANCELLED || this.state == STATE_QUEUED) {
return false;
}
this.priority = priority;
this.worker.getWorker().changePriority(this.task, this.priority.priority * 7);
return true;
}
}
@Override
public boolean setPrioritySubOrderStream(Priority priority, long subOrder, long stream) {
return this.setPriority(priority);
}
@Override
public boolean raisePriority(Priority priority) {
return this.setPriority(priority);
}
@Override
public boolean lowerPriority(Priority priority) {
return this.setPriority(priority);
}
@Override
public boolean execute() {
throw new UnsupportedOperationException();
}
@Override
public long getSubOrder() {
throw new UnsupportedOperationException();
}
@Override
public boolean setSubOrder(long subOrder) {
throw new UnsupportedOperationException();
}
@Override
public boolean raiseSubOrder(long subOrder) {
throw new UnsupportedOperationException();
}
@Override
public boolean lowerSubOrder(long subOrder) {
throw new UnsupportedOperationException();
}
@Override
public long getStream() {
throw new UnsupportedOperationException();
}
@Override
public boolean setStream(long stream) {
throw new UnsupportedOperationException();
}
@Override
public PrioritisedExecutor.PriorityState getPriorityState() {
throw new UnsupportedOperationException();
}
}
camellia-server/src/main/java/moe/monnairealms/camellia/utils/tasks/FlowSchedScheduledTask2CUTask.java
-172
View File
@@ -1,172 +0,0 @@
package moe.monnairealms.camellia.utils.tasks;
import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
import ca.spottedleaf.concurrentutil.util.Priority;
import com.ishland.c2me.base.common.scheduler.LockTokenImpl;
import com.ishland.c2me.base.common.scheduler.ScheduledTask;
import com.ishland.c2me.base.common.scheduler.SchedulingManager;
import com.ishland.flowsched.executor.LockToken;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.world.level.ChunkPos;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.CompletableFuture;
public class FlowSchedScheduledTask2CUTask implements PrioritisedExecutor.PrioritisedTask {
private static final int STATE_CREATED = 0;
private static final int STATE_QUEUED = 1;
private static final int STATE_CANCELLED = 2;
private volatile int state;
private volatile Priority priority;
private final ScheduledTask<?> task;
private final SchedulingManager worker;
private final ChunkPos pos;
@Contract("_, _, _, _ -> new")
private static <T> @NotNull ScheduledTask<T> createFlowSchedTaskOf(@NotNull ChunkPos target, int radius, SchedulingManager schedulingManager, Runnable action) {
ObjectArrayList<LockToken> lockTargets = new ObjectArrayList<>((2 * radius + 1) * (2 * radius + 1) + 1);
for (int x = target.x() - radius; x <= target.x() + radius; x++)
for (int z = target.z() - radius; z <= target.z() + radius; z++)
lockTargets.add(new LockTokenImpl(schedulingManager.getId(), ChunkPos.pack(x, z), LockTokenImpl.Usage.WORLDGEN));
return new ScheduledTask<>(
target.pack(),
() -> {
action.run();
return CompletableFuture.completedFuture(null);
},
lockTargets.toArray(LockToken[]::new));
}
public FlowSchedScheduledTask2CUTask(Runnable task, ChunkPos pos, int radius, SchedulingManager worker) {
this(createFlowSchedTaskOf(pos, radius, worker, task), pos, worker, Priority.NORMAL);
}
public FlowSchedScheduledTask2CUTask(Runnable task, ChunkPos pos, int radius, SchedulingManager worker, Priority priority) {
this(createFlowSchedTaskOf(pos, radius, worker, task), pos, worker, priority);
}
private FlowSchedScheduledTask2CUTask(ScheduledTask<?> task, ChunkPos pos, SchedulingManager worker, Priority priority) {
this.task = task;
this.pos = pos;
this.worker = worker;
this.priority = priority;
}
@Override
public PrioritisedExecutor getExecutor() {
throw new UnsupportedOperationException();
}
@Override
public boolean queue() {
synchronized (this) {
if (this.state > STATE_CREATED) {
return false;
}
this.state = STATE_QUEUED;
this.worker.updatePriorityFromLevel(this.pos.pack(), this.priority());
this.worker.enqueue(this.task);
return true;
}
}
@Override
public boolean isQueued() {
return this.state == STATE_QUEUED;
}
@Override
public boolean cancel() {
synchronized (this) {
if (this.state == STATE_CANCELLED || this.state == STATE_QUEUED) {
return false;
}
this.state = STATE_CANCELLED;
return true;
}
}
@Override
public Priority getPriority() {
return this.priority;
}
private int priority() {
return this.priority.priority * 7;
}
@Override
public boolean setPriority(Priority priority) {
synchronized (this) {
if (this.state == STATE_CANCELLED || this.state == STATE_QUEUED) {
return false;
}
this.priority = priority;
this.worker.updatePriorityFromLevel(this.pos.pack(), this.priority());
return true;
}
}
@Override
public boolean setPrioritySubOrderStream(Priority priority, long subOrder, long stream) {
return this.setPriority(priority);
}
@Override
public boolean raisePriority(Priority priority) {
return this.setPriority(priority);
}
@Override
public boolean lowerPriority(Priority priority) {
return this.setPriority(priority);
}
@Override
public boolean execute() {
throw new UnsupportedOperationException();
}
@Override
public long getSubOrder() {
throw new UnsupportedOperationException();
}
@Override
public boolean setSubOrder(long subOrder) {
throw new UnsupportedOperationException();
}
@Override
public boolean raiseSubOrder(long subOrder) {
throw new UnsupportedOperationException();
}
@Override
public boolean lowerSubOrder(long subOrder) {
throw new UnsupportedOperationException();
}
@Override
public long getStream() {
throw new UnsupportedOperationException();
}
@Override
public boolean setStream(long stream) {
throw new UnsupportedOperationException();
}
@Override
public PrioritisedExecutor.PriorityState getPriorityState() {
throw new UnsupportedOperationException();
}
}
settings.gradle.kts
+1 -3
View File
@@ -54,6 +54,4 @@ gradle.lifecycle.beforeProject {
"$mcVersion.build.$camelliaBuildNumber-${camelliaVersionChannel.lowercase()}" "$mcVersion.build.$camelliaBuildNumber-${camelliaVersionChannel.lowercase()}"
} }
version = versionString version = versionString
} }
include("FlowSched")