async_loop lifetime (arg) update

pisi/unitedmeows/meowlib/async/Async.java

@@ -10,8 +10,7 @@
 import java.util.UUID;
 
 public class Async {
-
-    /*TODO: Create ForgettableHashmap and replace this */
+
     private static HashMap<CoID, Task<?>> pointers;
 
     static {
@@ -64,7 +63,7 @@ public void run() {
 
 
     public static <X> Future<X> async_w(IAsyncAction action, final long after) {
-        // change this uuid alternative
+
         final CoID pointer = newPointer();
 
         Future<X> future = new Future<>(pointer);
@@ -93,11 +92,41 @@ public void run() {
                 }
             }
         };
+        promise.start();
+
+        MeowLib.getTaskPool().queue_w(task, repeatDelay);
+        return promise;
+    }
+
+    /* same as wloop but starts manually */
+    public static Promise async_wloop_w(IAsyncAction action, final long repeatDelay) {
+        final Promise promise = new Promise();
+        Task<?> task = new Task<Object>(action) {
+            @Override
+            public void run() {
+                if (promise.isValid()) {
+                    action.start(null);
+                    MeowLib.getTaskPool().queue_w(this, repeatDelay);
+                }
+            }
+        };
 
         MeowLib.getTaskPool().queue_w(task, repeatDelay);
         return promise;
     }
 
+    public static Promise async_loop(IAsyncAction action, final long repeatDelay, final long lifeTime) {
+        final Promise promise = async_loop(action, repeatDelay);
+        async_w((u) -> promise.stop(), lifeTime);
+        return promise;
+    }
+
+    public static Promise async_loop_w(IAsyncAction action, final long repeatDelay, final long lifeTime) {
+        final Promise promise = async_loop_w(action, repeatDelay);
+        async_w((u) -> promise.stop(), lifeTime + repeatDelay);
+        return promise;
+    }
+
     public static Promise async_loop(IAsyncAction action, final long repeatDelay) {
         final Promise promise = new Promise();
         Task<?> task = new Task<Object>(action) {
@@ -109,6 +138,24 @@ public void run() {
                 }
             }
         };
+        promise.start();
+
+        MeowLib.getTaskPool().queue(task);
+        return promise;
+    }
+
+    /* same as async_loop but starts manually */
+    public static Promise async_loop_w(IAsyncAction action, final long repeatDelay) {
+        final Promise promise = new Promise();
+        Task<?> task = new Task<Object>(action) {
+            @Override
+            public void run() {
+                if (promise.isValid()) {
+                    action.start(null);
+                    MeowLib.getTaskPool().queue_w(this, repeatDelay);
+                }
+            }
+        };
 
         MeowLib.getTaskPool().queue(task);
         return promise;

pisi/unitedmeows/meowlib/async/BasicTaskPool.java

@@ -53,7 +53,7 @@ public void workerC() {
                 TaskWorker freeWorker = new TaskWorker(this);
                 taskWorkers.add(freeWorker);
                 freeWorker.startWorker();
-            } else if (taskWorkers.size() > 3){
+            } else if (taskWorkers.size() > 6){
                 for (TaskWorker nWorking : nWorkings) {
                     taskWorkers.remove(nWorking);
                 }

pisi/unitedmeows/meowlib/async/Result.java

@@ -1,14 +1,14 @@
-package pisi.unitedmeows.meowlib.async;
-
-public class Result<X> {
-
-    protected X value;
-
-    public Result(X val) {
-        value = val;
-    }
-
-    public X value() {
-        return value;
-    }
-}
+package pisi.unitedmeows.meowlib.async;
+
+public class Result<X> {
+
+    protected X value;
+
+    public Result(X val) {
+        value = val;
+    }
+
+    public X value() {
+        return value;
+    }
+}

pisi/unitedmeows/meowlib/etc/IAction.java

@@ -1,8 +1,8 @@
-package pisi.unitedmeows.meowlib.etc;
-
-import java.util.UUID;
-
-@FunctionalInterface
-public interface IAction {
-    void run() throws Exception;
-}
+package pisi.unitedmeows.meowlib.etc;
+
+import java.util.UUID;
+
+@FunctionalInterface
+public interface IAction {
+    void run() throws Exception;
+}

pisi/unitedmeows/meowlib/etc/MLibSetting.java

@@ -1,23 +1,23 @@
-package pisi.unitedmeows.meowlib.etc;
-
-
-import java.io.Serializable;
-
-public class MLibSetting<X extends Serializable> {
-
-    private MLibSettings label;
-    private X value;
-
-    public MLibSetting(MLibSettings label, X value) {
-        this.label = label;
-        this.value = value;
-    }
-
-    public X getValue() {
-        return value;
-    }
-
-    public MLibSettings getLabel() {
-        return label;
-    }
-}
+package pisi.unitedmeows.meowlib.etc;
+
+
+import java.io.Serializable;
+
+public class MLibSetting<X extends Serializable> {
+
+    private MLibSettings label;
+    private X value;
+
+    public MLibSetting(MLibSettings label, X value) {
+        this.label = label;
+        this.value = value;
+    }
+
+    public X getValue() {
+        return value;
+    }
+
+    public MLibSettings getLabel() {
+        return label;
+    }
+}

pisi/unitedmeows/meowlib/etc/Tuple.java

@@ -1,28 +1,28 @@
-package pisi.unitedmeows.meowlib.etc;
-
-public class Tuple<F, S> {
-
-    private F first;
-    private S second;
-
-    public Tuple(F first, S second) {
-        this.first = first;
-        this.second = second;
-    }
-
-    public F getFirst() {
-        return first;
-    }
-
-    public S getSecond() {
-        return second;
-    }
-
-    public void setFirst(F first) {
-        this.first = first;
-    }
-
-    public void setSecond(S second) {
-        this.second = second;
-    }
-}
+package pisi.unitedmeows.meowlib.etc;
+
+public class Tuple<F, S> {
+
+    private F first;
+    private S second;
+
+    public Tuple(F first, S second) {
+        this.first = first;
+        this.second = second;
+    }
+
+    public F getFirst() {
+        return first;
+    }
+
+    public S getSecond() {
+        return second;
+    }
+
+    public void setFirst(F first) {
+        this.first = first;
+    }
+
+    public void setSecond(S second) {
+        this.second = second;
+    }
+}

pisi/unitedmeows/meowlib/etc/Tuple3.java

@@ -1,27 +1,27 @@
-package pisi.unitedmeows.meowlib.etc;
-
-public class Tuple3<F, S, T> {
-
-    private F first;
-    private S second;
-    private T third;
-
-
-    public Tuple3(F first, S second, T third) {
-        this.first = first;
-        this.second = second;
-        this.third = third;
-    }
-
-    public F getFirst() {
-        return first;
-    }
-
-    public S getSecond() {
-        return second;
-    }
-
-    public T getThird() {
-        return third;
-    }
-}
+package pisi.unitedmeows.meowlib.etc;
+
+public class Tuple3<F, S, T> {
+
+    private F first;
+    private S second;
+    private T third;
+
+
+    public Tuple3(F first, S second, T third) {
+        this.first = first;
+        this.second = second;
+        this.third = third;
+    }
+
+    public F getFirst() {
+        return first;
+    }
+
+    public S getSecond() {
+        return second;
+    }
+
+    public T getThird() {
+        return third;
+    }
+}

pisi/unitedmeows/meowlib/etc/Tuple4.java

@@ -1,33 +1,33 @@
-package pisi.unitedmeows.meowlib.etc;
-
-public class Tuple4<F, S, T, L> {
-
-    private F first;
-    private S second;
-    private T third;
-    private L last;
-
-
-    public Tuple4(F first, S second, T third, L last) {
-        this.first = first;
-        this.second = second;
-        this.third = third;
-        this.last = last;
-    }
-
-    public F getFirst() {
-        return first;
-    }
-
-    public S getSecond() {
-        return second;
-    }
-
-    public T getThird() {
-        return third;
-    }
-
-    public L getLast() {
-        return last;
-    }
-}
+package pisi.unitedmeows.meowlib.etc;
+
+public class Tuple4<F, S, T, L> {
+
+    private F first;
+    private S second;
+    private T third;
+    private L last;
+
+
+    public Tuple4(F first, S second, T third, L last) {
+        this.first = first;
+        this.second = second;
+        this.third = third;
+        this.last = last;
+    }
+
+    public F getFirst() {
+        return first;
+    }
+
+    public S getSecond() {
+        return second;
+    }
+
+    public T getThird() {
+        return third;
+    }
+
+    public L getLast() {
+        return last;
+    }
+}

pisi/unitedmeows/meowlib/etc/memorable/MemorableElement.java

@@ -1,7 +1,7 @@
-package pisi.unitedmeows.meowlib.etc.memorable;
-
-public class MemorableElement<X> {
-    public int index;
-    public X element;
-    public MemorableTail<X> parentTail;
-}
+package pisi.unitedmeows.meowlib.etc.memorable;
+
+public class MemorableElement<X> {
+    public int index;
+    public X element;
+    public MemorableTail<X> parentTail;
+}