From 3295ca2af98db53691ed9c016bdb1203ead775e0 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 17 Dec 2019 11:59:23 -0400 Subject: [PATCH] Revert "threading testing" This reverts commit 9ba573af --- .../java/carpet/script/CarpetExpression.java | 5 -- .../java/carpet/script/value/ThreadValue.java | 55 +++++-------------- src/main/resources/carpet.mixins.json | 1 - 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 8596f64b..e5a27ac0 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -944,18 +944,14 @@ public class CarpetExpression this.expr.addLazyFunction("set", -1, (c, t, lv) -> { - CarpetSettings.LOG.error("starting"); CarpetContext cc = (CarpetContext)c; ServerWorld world = cc.s.getWorld(); if (lv.size() < 2 || lv.size() % 2 == 1) throw new InternalExpressionException("'set' should have at least 2 params and odd attributes"); BlockValue.LocatorResult targetLocator = BlockValue.fromParams(cc, lv, 0); BlockValue.LocatorResult sourceLocator = BlockValue.fromParams(cc, lv, targetLocator.offset, true); - CarpetSettings.LOG.error("dafuq"); BlockState sourceBlockState = sourceLocator.block.getBlockState(); - CarpetSettings.LOG.error("finish dafuq"); BlockState targetBlockState = world.getBlockState(targetLocator.block.getPos()); - CarpetSettings.LOG.error("finish dafuq 2"); if (sourceLocator.offset < lv.size()) { StateFactory states = sourceBlockState.getBlock().getStateFactory(); @@ -969,7 +965,6 @@ public class CarpetExpression sourceBlockState = setProperty(property, paramString, paramValue, sourceBlockState); } } - CarpetSettings.LOG.error("finish properties got"); CompoundTag data = sourceLocator.block.getData(); diff --git a/src/main/java/carpet/script/value/ThreadValue.java b/src/main/java/carpet/script/value/ThreadValue.java index 6c5409bd..382cd6b2 100644 --- a/src/main/java/carpet/script/value/ThreadValue.java +++ b/src/main/java/carpet/script/value/ThreadValue.java @@ -1,6 +1,5 @@ package carpet.script.value; -import carpet.CarpetSettings; import carpet.script.Context; import carpet.script.Expression; import carpet.script.Tokenizer; @@ -10,7 +9,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; @@ -19,13 +17,9 @@ import java.util.function.Supplier; public class ThreadValue extends Value { private CompletableFuture taskFuture; - //public static ThreadLocal joining = ThreadLocal.withInitial(() -> false); - public final static Map waitingTreads = new ConcurrentHashMap<>(); - public static Map joinRequestedThreads = new ConcurrentHashMap<>(); private long id; private final Object lock; - //private final boolean[] started; - private Thread executingThread; + private final boolean[] started; private Suppliertask; private static long sequence = 0L; @@ -35,20 +29,18 @@ public class ThreadValue extends Value { id = sequence++; lock = new Object(); - executingThread = null; - //started = new boolean[]{false}; + started = new boolean[]{false}; task = () -> { - if (executingThread == null) + if (!started[0]) { - CarpetSettings.LOG.error("Setting the thread"); - executingThread = Thread.currentThread(); + started[0] = true; return function.lazyEval(ctx, Context.NONE, expr, token, Collections.emptyList()).evalValue(ctx); } return null; }; taskFuture = CompletableFuture.supplyAsync( - () -> { synchronized (lock) { CarpetSettings.LOG.error("getting in future"); Value ret = task.get(); CarpetSettings.LOG.error("gotten in future"); return ret;} }, + () -> { synchronized (lock) { return task.get(); } }, executorServices.computeIfAbsent(pool, (v) -> (ThreadPoolExecutor)Executors.newCachedThreadPool()) ); Thread.yield(); @@ -68,45 +60,26 @@ public class ThreadValue extends Value public Value join() { - CarpetSettings.LOG.error("in join "+id); - if (executingThread == null) + if (!started[0]) { - CarpetSettings.LOG.error("not started "+id); - Value res; - waitingTreads.put(Thread.currentThread(), 1); - try + synchronized (lock) { - CarpetSettings.LOG.error(" getting result "+id); - res = task.get(); - CarpetSettings.LOG.error(" result got "+id); + if (!started[0]) + { + Value res = task.get(); + taskFuture.complete(res); + return res; + } } - finally - { - waitingTreads.remove(Thread.currentThread()); - } - taskFuture.complete(res); - return res; } try { - synchronized (waitingTreads) - { - if (waitingTreads.containsKey(executingThread)) - throw new InternalExpressionException("Cannot wait/join on world accessing thread"); - waitingTreads.put(executingThread, 1); - } - CarpetSettings.LOG.error("getting future "+id); return taskFuture.get(); } catch (InterruptedException | ExecutionException e) { return Value.NULL; } - finally - { - waitingTreads.remove(executingThread); - CarpetSettings.LOG.error(" future gotten "+id); - } } public boolean isFinished() @@ -120,7 +93,7 @@ public class ThreadValue extends Value { if (!taskFuture.isDone()) { - executingThread = Thread.currentThread(); + started[0] = true; taskFuture.complete(Value.NULL); } } diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 90b4e437..5ce2fe8d 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -143,7 +143,6 @@ "FallingBlockEntity_scarpetEventsMixin", "ChunkTicketManager_scarpetMixin", "ServerChunkManager_scarpetMixin", - "ServerChunkManager_scarpetThreadingProtectionMixin", "PistonBlock_movableTEMixin",