Migrated ResourceRunnable to use PoorMansLock
This commit is contained in:
@@ -5,13 +5,12 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import mc.core.events.api.EventQueueOwner;
|
||||
import mc.core.events.lock.LockObserveList;
|
||||
import mc.core.events.runner.EventExecutorService;
|
||||
import mc.core.events.runner.ResourceRunnable;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.locks.Lock;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@Getter
|
||||
@@ -41,7 +40,7 @@ public class EventPipelineTask {
|
||||
|
||||
RegisteredEventHandler handler = handlers.get(currentIndex);
|
||||
if (!event.isCanceled() || !handler.isIgnoreCancelled()) {
|
||||
List<Lock> locks = getLocks(handler);
|
||||
LockObserveList locks = getLocks(handler);
|
||||
|
||||
service.addTask(new ResourceRunnable() {
|
||||
@Override
|
||||
@@ -60,7 +59,7 @@ public class EventPipelineTask {
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Lock> getLocks() {
|
||||
public LockObserveList getLocks() {
|
||||
return locks;
|
||||
}
|
||||
});
|
||||
@@ -70,12 +69,14 @@ public class EventPipelineTask {
|
||||
}
|
||||
}
|
||||
|
||||
private List<Lock> getLocks(RegisteredEventHandler handler) {
|
||||
List<Lock> locks = new ArrayList<>();
|
||||
private LockObserveList getLocks(RegisteredEventHandler handler) {
|
||||
LockObserveList locks = new LockObserveList();
|
||||
/*
|
||||
|
||||
if (handler.isPluginSynchronize())
|
||||
locks.add(manager.getResourceManager().getPluginLock(handler.getPlugin()));
|
||||
|
||||
*/
|
||||
|
||||
return locks;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class LockObserveList implements Consumer<PoorMansLock> {
|
||||
public static LockObserveList EMPTY_LIST = new LockObserveList();
|
||||
private List<PoorMansLock> locks = new ArrayList<>();
|
||||
private Runnable callback;
|
||||
|
||||
@@ -32,6 +33,16 @@ public class LockObserveList implements Consumer<PoorMansLock> {
|
||||
return true;
|
||||
}
|
||||
|
||||
public void lockAll() {
|
||||
for (PoorMansLock lock : locks)
|
||||
lock.lock();
|
||||
}
|
||||
|
||||
public void unlockAll() {
|
||||
for (PoorMansLock lock : locks)
|
||||
lock.unlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(PoorMansLock lock) {
|
||||
if (!lock.isLocked()) {
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package mc.core.events.runner;
|
||||
|
||||
import java.util.concurrent.locks.Lock;
|
||||
|
||||
public class ExecutorThread extends Thread {
|
||||
private EventExecutorService service;
|
||||
|
||||
@@ -25,15 +23,12 @@ public class ExecutorThread extends Thread {
|
||||
}
|
||||
|
||||
void executeTask(ResourceRunnable runnable) {
|
||||
for (Lock lock : runnable.getLocks()) {
|
||||
lock.lock();
|
||||
}
|
||||
runnable.getLocks().lockAll();
|
||||
try {
|
||||
runnable.run();
|
||||
} finally {
|
||||
for (Lock lock : runnable.getLocks()) {
|
||||
lock.unlock();
|
||||
}
|
||||
runnable.getLocks().unlockAll();
|
||||
runnable.getLocks().release();
|
||||
}
|
||||
runnable.after();
|
||||
}
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
package mc.core.events.runner;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.locks.Lock;
|
||||
import mc.core.events.lock.LockObserveList;
|
||||
|
||||
public interface ResourceRunnable extends Runnable {
|
||||
default List<Lock> getLocks() {
|
||||
return Collections.emptyList();
|
||||
default LockObserveList getLocks() {
|
||||
return LockObserveList.EMPTY_LIST;
|
||||
}
|
||||
|
||||
default void after() {
|
||||
|
||||
Reference in New Issue
Block a user