From 5909e2ca0a2cfdf18497b08f7b73a8a3bf3f6c20 Mon Sep 17 00:00:00 2001 From: FuckYou Date: Thu, 15 Dec 2016 14:40:26 +0400 Subject: [PATCH] Major Update - Fixed Iterator and added remove() - Added support for dispatching batch Async operations - Rewrote lots of code to support lower language levels (java 5+) --- .idea/misc.xml | 2 +- src/com/tofvesson/async/Async.java | 86 ++++++++++--------- src/com/tofvesson/async/AsyncBatch.java | 27 ++++++ src/com/tofvesson/async/BatchRunnable.java | 5 ++ src/com/tofvesson/async/EcoAsync$1.java | 1 - src/com/tofvesson/async/WorkerThread.java | 38 ++++---- .../tofvesson/collections/ShiftingList.java | 80 +++++++---------- src/com/tofvesson/logging/TagStream.java | 2 +- .../tofvesson/reflection/SafeReflection.java | 5 +- 9 files changed, 135 insertions(+), 111 deletions(-) create mode 100644 src/com/tofvesson/async/AsyncBatch.java create mode 100644 src/com/tofvesson/async/BatchRunnable.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 9793229..1b4d85b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/com/tofvesson/async/Async.java b/src/com/tofvesson/async/Async.java index 0e25302..b8af361 100644 --- a/src/com/tofvesson/async/Async.java +++ b/src/com/tofvesson/async/Async.java @@ -32,16 +32,18 @@ public class Async { * @param millis Milliseconds to wait. * @param micros Microseconds to wait. */ - private Async(long millis, int micros){ - task = new Thread(()->{ - new ThreadLocal().set(Async.this); - try { - Thread.sleep(millis, micros); - this.complete = true; - } catch (InterruptedException t1) { - if(!this.failed) { - this.failed = true; - this.t=t1; + private Async(final long millis, final int micros){ + task = new Thread(new Runnable(){ + public void run(){ + new ThreadLocal().set(Async.this); + try { + Thread.sleep(millis, micros); + Async.this.complete = true; + } catch (InterruptedException t1) { + if(!Async.this.failed) { + Async.this.failed = true; + Async.this.t=t1; + } } } }); @@ -53,17 +55,19 @@ public class Async { * Create Async process with runnable. * @param r Runnable to execute as new task. */ - public Async(Runnable r){ - task = new Thread(()->{ - try { - new ThreadLocal() - .set(Async.this); // Store ThreadLocal reference to Async object - r.run(); // Execute runnable - complete = true; // Notify all threads who are checking - } catch (Throwable t1) { // Prepare for failure - if(!failed) { // Checks if task was canceled - failed = true; // Notifies all threads that task failed - t=t1; // Makes error accessible to be thrown + public Async(final Runnable r){ + task = new Thread(new Runnable(){ + public void run(){ + try { + new ThreadLocal() + .set(Async.this); // Store ThreadLocal reference to Async object + r.run(); // Execute runnable + complete = true; // Notify all threads who are checking + } catch (Throwable t1) { // Prepare for failure + if(!failed) { // Checks if task was canceled + failed = true; // Notifies all threads that task failed + t=t1; // Makes error accessible to be thrown + } } } }); // Execute thread with runnable @@ -80,15 +84,17 @@ public class Async { */ public Async(final Object o, final Method method, final Object... params){ method.setAccessible(true); // Ensure that no crash occurs - task = new Thread(()-> { // Create a new thread - try { - new ThreadLocal().set(Async.this); - ret = (T) method.invoke(o, params); // Invoke given method - complete = true; // Notify all threads who are checking - } catch (Throwable t1) { // Prepare for failure - if(!failed) { // Checks if task was canceled - failed = true; // Notifies all threads that task failed - t=t1; // Makes error accessible to be thrown + task = new Thread(new Runnable(){ // Create a new thread + public void run(){ + try { + new ThreadLocal().set(Async.this); + ret = (T) method.invoke(o, params); // Invoke given method + complete = true; // Notify all threads who are checking + } catch (Throwable t1) { // Prepare for failure + if(!failed) { // Checks if task was canceled + failed = true; // Notifies all threads that task failed + t=t1; // Makes error accessible to be thrown + } } } }); @@ -123,15 +129,17 @@ public class Async { */ public Async(final Constructor c, final Object... params){ c.setAccessible(true); // Ensure that constructor can be called - task = new Thread(() -> { // Creates a new thread for asynchronous execution - new ThreadLocal().set(Async.this); - try { - ret = c.newInstance(params); // Create a new instance: invoke "" method - complete = true; // Notify all threads that async is finished - } catch (Throwable t1) { // Handle crash - if(!failed) { // Ensure that crash wasn't called by cancel() - failed = true; // Notify all threads that error has been encountered - t=t1; // Make throwable accessible to be thrown in caller thread + task = new Thread(new Runnable() { // Creates a new thread for asynchronous execution + public void run(){ + new ThreadLocal().set(Async.this); + try { + ret = c.newInstance(params); // Create a new instance: invoke "" method + complete = true; // Notify all threads that async is finished + } catch (Throwable t1) { // Handle crash + if(!failed) { // Ensure that crash wasn't called by cancel() + failed = true; // Notify all threads that error has been encountered + t=t1; // Make throwable accessible to be thrown in caller thread + } } } }); diff --git a/src/com/tofvesson/async/AsyncBatch.java b/src/com/tofvesson/async/AsyncBatch.java new file mode 100644 index 0000000..ff35b72 --- /dev/null +++ b/src/com/tofvesson/async/AsyncBatch.java @@ -0,0 +1,27 @@ +package com.tofvesson.async; + +import java.util.HashMap; + +/** + * Creates a batch of similar async instructions. + */ +@SuppressWarnings("unused") +public class AsyncBatch { + + private final HashMap all = new HashMap(); + + public AsyncBatch(int count, final BatchRunnable r) { for(int i = 0; i getAll(){ return all; } + public HashMap awaitAll(){ + HashMap al = new HashMap(); + for(Integer a : all.keySet()) + al.put(a, all.get(a).await()); + return al; + } + public int getFinished(){ int i = 0; for(Async a : all.values()) if(!a.isAlive()) ++i; return i; } + public int size(){ return all.size(); } + public boolean allFinished(){ return getFinished()==all.size(); } + public void cancelAll(){ for(Async a : all.values()) a.cancel(); } +} diff --git a/src/com/tofvesson/async/BatchRunnable.java b/src/com/tofvesson/async/BatchRunnable.java new file mode 100644 index 0000000..67a87c5 --- /dev/null +++ b/src/com/tofvesson/async/BatchRunnable.java @@ -0,0 +1,5 @@ +package com.tofvesson.async; + +public interface BatchRunnable { + void run(int index); +} diff --git a/src/com/tofvesson/async/EcoAsync$1.java b/src/com/tofvesson/async/EcoAsync$1.java index 5ea112e..3eaebf9 100644 --- a/src/com/tofvesson/async/EcoAsync$1.java +++ b/src/com/tofvesson/async/EcoAsync$1.java @@ -20,7 +20,6 @@ class EcoAsync$1 implements Runnable{ this.val$params = val$params; } - @Override public void run() { synchronized (this) { try { diff --git a/src/com/tofvesson/async/WorkerThread.java b/src/com/tofvesson/async/WorkerThread.java index 95e8f59..902eb53 100644 --- a/src/com/tofvesson/async/WorkerThread.java +++ b/src/com/tofvesson/async/WorkerThread.java @@ -1,12 +1,11 @@ package com.tofvesson.async; import javafx.util.Pair; + import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadLocalRandom; /** * A thread tasked with accepting multiple instructions. This is useful for people who don't want to constantly create new threads for heavy work. @@ -14,9 +13,9 @@ import java.util.concurrent.ThreadLocalRandom; */ public class WorkerThread extends Thread { - List ids = new ArrayList<>(); + List ids = new ArrayList(); volatile Queue>>> queue; - volatile Map output = new HashMap<>(); + volatile Map output = new HashMap(); volatile boolean alive=true, completed=false; /** @@ -28,25 +27,27 @@ public class WorkerThread extends Thread { try{ Field f = Thread.class.getDeclaredField("target"); f.setAccessible(true); - f.set(this, (Runnable) ()-> + f.set(this, new Runnable() { - synchronized (Thread.currentThread()) { - while (alive) { - if (queue.size() != 0) { - Pair>> q = queue.poll(); - Pair> instr = q.getValue(); - try { - output.put(q.getKey(), instr.getKey().invoke(instr.getValue().getKey(), (Object[]) instr.getValue().getValue())); - completed = true; - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); + public void run(){ + synchronized (Thread.currentThread()) { + while (alive) { + if (queue.size() != 0) { + Pair>> q = queue.poll(); + Pair> instr = q.getValue(); + try { + output.put(q.getKey(), instr.getKey().invoke(instr.getValue().getKey(), (Object[]) instr.getValue().getValue())); + completed = true; + } catch (Exception e) { + e.printStackTrace(); + } } } } } }); }catch(Exception e){} - queue = new ArrayBlockingQueue<>(queueSize); + queue = new ArrayBlockingQueue>>>(queueSize); } /** @@ -59,8 +60,9 @@ public class WorkerThread extends Thread { public long push(Object invokeOn, Method m, Object... params){ m.setAccessible(true); long id; - do{ id = ThreadLocalRandom.current().nextLong(); }while(ids.contains(id)); - queue.add(new Pair<>(id, new Pair<>(m, new Pair<>(invokeOn, params)))); + Random r = new Random(); + do{ id = r.nextLong(); }while(ids.contains(id)); + queue.add(new Pair>>(id, new Pair>(m, new Pair(invokeOn, params)))); ids.add(id); return id; } diff --git a/src/com/tofvesson/collections/ShiftingList.java b/src/com/tofvesson/collections/ShiftingList.java index 9a846ab..4517ee5 100644 --- a/src/com/tofvesson/collections/ShiftingList.java +++ b/src/com/tofvesson/collections/ShiftingList.java @@ -3,7 +3,6 @@ package com.tofvesson.collections; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.stream.Collectors; @SuppressWarnings({"unchecked", "ReturnOfInnerClass", "unused"}) public class ShiftingList implements List { @@ -42,24 +41,20 @@ public class ShiftingList implements List { this(maxSize, 0.75); } - @Override public int size() { return pop; } - @Override public boolean isEmpty() { return pop==0; } - @Override public boolean contains(Object o) { if(o==empty) return false; for(int i = 0; i implements List { return o; } - @Override public T[] toArray(T[] a) { for(int i = 0; i implements List { return true; } - @Override public boolean remove(Object o) { for(int i = 0; i c) { boolean b = true; for(Object o : c) b &= contains(o); return b; } - @Override public boolean addAll(Collection c) { - ArrayList l = c.stream().filter(e -> !contains(e)).collect(Collectors.toCollection(ArrayList::new)); + ArrayList l = new ArrayList(); + for(E e : c) if(!contains(e)) l.add(e); if(l.size()>maxSize) for(int i = maxSize; i implements List { return true; } - @Override public boolean addAll(int index, Collection c) { if(index>=maxSize) return false; if(index>=entries.length || index<0 || c.size()==0) return false; - ArrayList l = c.stream().filter(e -> !contains(e)).collect(Collectors.toCollection(ArrayList::new)); + ArrayList l = new ArrayList(); + for(E e : c) if(!contains(e)) l.add(e); if(index+l.size()>maxSize) for(int i = maxSize-index; i= maxSize ? pop : pop+l.size(); @@ -127,7 +117,6 @@ public class ShiftingList implements List { return true; } - @Override public boolean retainAll(Collection c) { int removed = 0; for(int i = 0; i implements List { return true; } - @Override public boolean removeAll(Collection c) { int removed = 0; for(int i = 0; i implements List { return true; } - @Override public void clear() { pop = 0; entries = new Object[1]; } - @Override public int indexOf(Object o){ for(int i = 0; i implements List { System.arraycopy(entries, 0, entries, accountFor, entries.length-accountFor); // Shift array elements to account for new elements } - @Override public E get(int i){ if(i>pop) return null; return entries[i]==empty?null:(E)entries[i]; } - @Override public E set(int index, E element) { if(index > pop) return null; E e = get(index); @@ -229,7 +213,6 @@ public class ShiftingList implements List { return e; } - @Override public void add(int index, E element) { if(index<0 || contains(element)) return; Object o = element==null?empty:element; @@ -243,7 +226,6 @@ public class ShiftingList implements List { entries[index] = o; } - @Override public E remove(int index) { if(index>pop || index<0) return null; E e = entries[index]==empty?null:(E)entries[index]; @@ -253,7 +235,6 @@ public class ShiftingList implements List { return e; } - @Override public int lastIndexOf(Object o) { for(int i = pop; i>0; --i) if(o.equals(entries[i])) @@ -261,22 +242,18 @@ public class ShiftingList implements List { return -1; } - @Override - public Iterator iterator(){ return new Iterator<>(pop, entries); } + public Iterator iterator(){ return new Iterator(this); } - @Override - public ListIterator listIterator(){ return new ListIterator<>(this); } + public ListIterator listIterator(){ return new ListIterator(this); } - @Override public ListIterator listIterator(int index) { if(index<0) throw new RuntimeException("Invalid starting point for iterator defined: "+index); - return new ListIterator<>(this, index); + return new ListIterator(this, index); } - @Override public List subList(int fromIndex, int toIndex) { - if(fromIndex<0 || fromIndex>=toIndex || fromIndex>pop || toIndex>pop) return new ArrayList<>(); - ShiftingList l = new ShiftingList<>(maxSize); + if(fromIndex<0 || fromIndex>=toIndex || fromIndex>pop || toIndex>pop) return new ArrayList(); + ShiftingList l = new ShiftingList(maxSize); for(int i = toIndex-1; i>fromIndex; --i) l.add(entries[i]==empty?null:(E)entries[i]); return l; } @@ -287,11 +264,16 @@ public class ShiftingList implements List { */ public static class Iterator implements java.util.Iterator{ protected int counter = 0; - private final int pop; - private final Object[] entries; - public Iterator(int pop, Object[] entries){ this.pop = pop; this.entries = entries; } - @Override public boolean hasNext() { return counter implements List { private final ShiftingList list; public ListIterator(ShiftingList list){ this.pop = list.pop; this.entries = list.entries; this.list = list;} public ListIterator(ShiftingList list, int start){ this(list); counter = start; } - @Override public boolean hasNext() { return counter0&&pop!=0; } - @Override public V previous() { opNxt = false; return (V)(pEl=entries[--counter]==empty?null:entries[counter]); } - @Override public int nextIndex() { return counter+10&&pop!=0; } + public V previous() { opNxt = false; return (V)(pEl=entries[--counter]==empty?null:entries[counter]); } + public int nextIndex() { return counter+1 tags = new ArrayList<>(); + private List tags = new ArrayList(); public TagStream(PrintStream node){ super(node); diff --git a/src/com/tofvesson/reflection/SafeReflection.java b/src/com/tofvesson/reflection/SafeReflection.java index 0acf83d..68e15b1 100644 --- a/src/com/tofvesson/reflection/SafeReflection.java +++ b/src/com/tofvesson/reflection/SafeReflection.java @@ -1,9 +1,10 @@ package com.tofvesson.reflection; -import java.lang.reflect.Constructor; import sun.misc.Unsafe; import sun.reflect.ConstructorAccessor; + import java.lang.reflect.Array; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.HashMap; @@ -281,7 +282,7 @@ public class SafeReflection { * A definition for custom enum creation. */ public static class EnumDefinition { - HashMap params = new HashMap<>(); // Assign a specific type to each parameter + HashMap params = new HashMap(); // Assign a specific type to each parameter /** * Put an object in the parameter list.