Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-06-26 14:44:50 +02:00
Code Issues Projects Releases Wiki Activity

Use supplier instead of RunnableVal for sync

Browse Source
This commit is contained in:
Jesse Boyd 2018-01-15 15:39:55 +11:00
parent 0a246fc90f
commit 446dc9c568
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -110,5 +110,6 @@ subprojects {
maven {url "http://maven.sk89q.com/artifactory/repo"}
maven {url "http://repo.spongepowered.org/maven"}
maven {url "https://repo.inventivetalent.org/content/groups/public/"}
maven {url "http://dl.bintray.com/tastybento/maven-repo"}
}
}

1
bukkit/build.gradle
View File

@ -1,6 +1,5 @@
repositories {
flatDir {dirs 'lib'}
maven {url "http://dl.bintray.com/tastybento/maven-repo"}
}
dependencies {
compile project(':core')

24
core/src/main/java/com/boydti/fawe/util/TaskManager.java
View File

@ -9,6 +9,7 @@ import java.util.Iterator;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import javax.annotation.Nullable;
public abstract class TaskManager {
@ -284,6 +285,10 @@ public abstract class TaskManager {
return sync(function, Integer.MAX_VALUE);
}
public <T> T sync(final Supplier<T> function) {
return sync(function, Integer.MAX_VALUE);
}
public void wait(AtomicBoolean running, int timout) {
try {
long start = System.currentTimeMillis();
@ -380,16 +385,19 @@ public abstract class TaskManager {
* @return
*/
public <T> T sync(final RunnableVal<T> function, int timeout) {
return sync((Supplier<T>) function, timeout);
}
public <T> T sync(final Supplier<T> function, int timeout) {
if (Fawe.get().getMainThread() == Thread.currentThread()) {
function.run();
return function.value;
return function.get();
}
final AtomicBoolean running = new AtomicBoolean(true);
RunnableVal<RuntimeException> run = new RunnableVal<RuntimeException>() {
RunnableVal<Object> run = new RunnableVal<Object>() {
@Override
public void run(RuntimeException value) {
public void run(Object value) {
try {
function.run();
this.value = function.get();
} catch (RuntimeException e) {
this.value = e;
} catch (Throwable neverHappens) {
@ -412,9 +420,9 @@ public abstract class TaskManager {
} catch (InterruptedException e) {
MainUtil.handleError(e);
}
if (run.value != null) {
throw run.value;
if (run.value != null && run.value instanceof RuntimeException) {
throw (RuntimeException) run.value;
}
return function.value;
return (T) run.value;
}
}