removed buggy pseudo concurrent handling

src/me/hammerle/snuviscript/code/FunctionRegistry.java

@@ -55,12 +55,12 @@ public class FunctionRegistry {
         registerConsumer("event.load", (sc, in) -> {
             String event = in[0].getString(sc);
             sc.loadEvent(event);
-            sc.getScriptManager().loadEventSafe(event, sc);
+            sc.getScriptManager().loadEvent(event, sc);
         });
         registerConsumer("event.unload", (sc, in) -> {
             String event = in[0].getString(sc);
             sc.unloadEvent(in[0].getString(sc));
-            sc.getScriptManager().unloadEventSafe(event, sc);
+            sc.getScriptManager().unloadEvent(event, sc);
         });
         registerFunction("event.isloaded", (sc, in) -> sc.isEventLoaded(in[0].getString(sc)));
         registerFunction("script.get", (sc, in) -> {
@@ -91,7 +91,7 @@ public class FunctionRegistry {
         registerConsumer("script.term", (sc, in) -> {
             Script other = (Script) in[0].get(sc);
             other.term();
-            sc.getScriptManager().removeScriptSafe(other);
+            sc.getScriptManager().removeScript(other);
         });
         registerFunction(">>", (sc, in) -> (double) (in[0].getInt(sc) >> in[1].getInt(sc)));
         registerFunction("<<", (sc, in) -> (double) (in[0].getInt(sc) << in[1].getInt(sc)));
@@ -456,7 +456,7 @@ public class FunctionRegistry {
                 sc.gotoLabel(label, true, 1);
                 sc.run();
                 if(sc.shouldTerm()) {
-                    sc.getScriptManager().removeScriptSafe(sc);
+                    sc.getScriptManager().removeScript(sc);
                 }
             }, time);
         });
@@ -524,13 +524,13 @@ public class FunctionRegistry {
                 sc.setHolded(false);
                 sc.run();
                 if(sc.shouldTerm()) {
-                    sc.getScriptManager().removeScriptSafe(sc);
+                    sc.getScriptManager().removeScript(sc);
                 }
             }, l);
         });
         registerConsumer("term", (sc, in) -> {
             sc.term();
-            sc.getScriptManager().removeScriptSafe(sc);
+            sc.getScriptManager().removeScript(sc);
         });
         registerFunction("isdouble", (sc, in) -> (in[0].get(sc) instanceof Double));
         registerFunction("islong", (sc, in) -> {

src/me/hammerle/snuviscript/code/ScriptManager.java

@@ -1,10 +1,10 @@
 package me.hammerle.snuviscript.code;
 
-import java.util.ArrayList;
 import me.hammerle.snuviscript.inputprovider.InputProvider;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collections;
-import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import me.hammerle.snuviscript.exceptions.PreScriptException;
 import me.hammerle.snuviscript.exceptions.StackTrace;
@@ -13,13 +13,8 @@ public class ScriptManager {
     private final ISnuviLogger logger;
     private final ISnuviScheduler scheduler;
 
-    private final HashMap<Integer, Script> scripts = new HashMap<>();
+    private final ConcurrentHashMap<Integer, Script> scripts = new ConcurrentHashMap<>();
-    private final HashMap<String, HashSet<Script>> loadedEvents = new HashMap<>();
+    private final ConcurrentHashMap<String, Set<Script>> loadedEvents = new ConcurrentHashMap<>();
-
-    private boolean isIterating = false;
-    private final ArrayList<Script> addList = new ArrayList<>();
-    private final ArrayList<Script> removeList = new ArrayList<>();
-    private final ArrayList<Runnable> eventAddList = new ArrayList<>();
 
     public ScriptManager(ISnuviLogger logger, ISnuviScheduler scheduler) {
         this.logger = logger;
@@ -56,7 +51,7 @@ public class ScriptManager {
         return scripts.get(id);
     }
 
-    private void removeScriptUnsafe(Script sc) {
+    public void removeScript(Script sc) {
         sc.term();
         sc.onTerm();
         scripts.remove(sc.getId());
@@ -68,44 +63,17 @@ public class ScriptManager {
         sc.onStart();
         sc.run();
         if(sc.shouldTerm()) {
-            removeScriptUnsafe(sc);
+            removeScript(sc);
         }
     }
 
-    private void handleQueues() {
+    public void removeScripts() {
-        if(!removeList.isEmpty()) {
-            removeList.forEach(sc -> removeScriptUnsafe(sc));
-            removeList.clear();
-        }
-        if(!addList.isEmpty()) {
-            addList.forEach(sc -> addScript(sc));
-            addList.clear();
-        }
-        if(!eventAddList.isEmpty()) {
-            eventAddList.forEach(r -> r.run());
-            eventAddList.clear();
-        }
-    }
-
-    public void removeScriptSafe(Script sc) {
-        if(isIterating) {
-            removeList.add(sc);
-        } else {
-            removeScriptUnsafe(sc);
-        }
-    }
-
-    public boolean removeScriptsSafe() {
-        if(isIterating) {
-            return false;
-        }
         scripts.values().forEach(sc -> {
             sc.term();
             sc.onTerm();
         });
         scripts.clear();
         loadedEvents.values().forEach(list -> list.clear());
-        return true;
     }
 
     public Collection<Script> getScripts() {
@@ -119,11 +87,7 @@ public class ScriptManager {
         try {
             Script sc = new Script(this, onStart, onTerm, name, paths);
             sc.setEventBroadcast(rEventBroadcast);
-            if(isIterating) {
+            addScript(sc);
-                addList.add(sc);
-            } else {
-                addScript(sc);
-            }
             return sc;
         } catch(PreScriptException ex) {
             logger.print(null, ex, null, paths[0], null, new StackTrace(ex.getLine()));
@@ -135,82 +99,55 @@ public class ScriptManager {
         return startScript(rEventBroadcast, null, null, name, paths);
     }
 
-    // -------------------------------------------------------------------------
+    public void loadEvent(String event, Script sc) {
-    // event
+        Set<Script> set = loadedEvents.get(event);
-    // -------------------------------------------------------------------------
-    private void loadEventUnsafe(String event, Script sc) {
-        HashSet<Script> set = loadedEvents.get(event);
         if(set == null) {
-            set = new HashSet<>();
+            set = Collections.newSetFromMap(new ConcurrentHashMap<>());
             loadedEvents.put(event, set);
         }
         set.add(sc);
     }
 
-    private void unloadEventUnsafe(String event, Script sc) {
+    public void unloadEvent(String event, Script sc) {
-        HashSet<Script> set = loadedEvents.get(event);
+        Set<Script> set = loadedEvents.get(event);
         if(set != null) {
             set.remove(sc);
         }
     }
 
-    public void loadEventSafe(String event, Script sc) {
-        if(isIterating) {
-            eventAddList.add(() -> loadEventUnsafe(event, sc));
-        } else {
-            loadEventUnsafe(event, sc);
-        }
-    }
-
-    public void unloadEventSafe(String event, Script sc) {
-        if(isIterating) {
-            eventAddList.add(() -> unloadEventUnsafe(event, sc));
-        } else {
-            unloadEventUnsafe(event, sc);
-        }
-    }
-
     public void callEvent(String name, Consumer<Script> before, Consumer<Script> after) {
-        HashSet<Script> set = loadedEvents.get(name);
+        Set<Script> set = loadedEvents.get(name);
         if(set == null) {
             return;
         }
-
-        isIterating = true;
         try {
-            set.stream().filter(sc -> sc.shouldReceiveEventBroadcast() && !sc.isHolded() && sc.isWaiting())
+            set.stream()
-                    .forEach(sc -> {
+                    .filter(sc -> sc.shouldReceiveEventBroadcast() && !sc.isHolded() && sc.isWaiting())
-                        sc.setVar("event", name);
+                    .forEach(sc -> runEvent(name, sc, before, after));
-                        if(before != null) {
-                            before.accept(sc);
-                        }
-                        sc.run();
-                        if(after != null) {
-                            after.accept(sc);
-                        }
-                    });
         } catch(Exception ex) {
             ex.printStackTrace();
         }
-        isIterating = false;
-        handleQueues();
     }
 
     public boolean callEvent(String name, Script sc, Consumer<Script> before, Consumer<Script> after) {
         if(sc.isEventLoaded(name) && !sc.isHolded() && sc.isWaiting()) {
-            sc.setVar("event", name);
+            runEvent(name, sc, before, after);
-            if(before != null) {
-                before.accept(sc);
-            }
-            sc.run();
-            if(after != null) {
-                after.accept(sc);
-            }
-            if(sc.shouldTerm()) {
-                removeScriptUnsafe(sc);
-            }
             return true;
         }
         return false;
     }
+
+    private void runEvent(String name, Script sc, Consumer<Script> before, Consumer<Script> after) {
+        sc.setVar("event", name);
+        if(before != null) {
+            before.accept(sc);
+        }
+        sc.run();
+        if(after != null) {
+            after.accept(sc);
+        }
+        if(sc.shouldTerm()) {
+            removeScript(sc);
+        }
+    }
 }

uploadToServer.sh

@@ -1,2 +1,2 @@
-ant
+ant -f . -Dnb.internal.action.name=build jar
 scp dist/SnuviScriptRecoded.jar alpaga:../minecraft/server/mods/libs