Developed module loader algorithm

This commit is contained in:
Евгений Смирнов 2021-06-30 19:59:30 +03:00
parent 3859db5b27
commit a9724d9d4c
3 changed files with 59 additions and 23 deletions

View File

@ -32,7 +32,8 @@ public class ProgressiaLauncher {
arguments = args.clone(); arguments = args.clone();
setupCrashReports(); setupCrashReports();
proxy.initialize(); proxy.initialize();
TaskManager.startLoading(); TaskManager tm = new TaskManager();
tm.startLoading();
} }
private static void setupCrashReports() { private static void setupCrashReports() {

View File

@ -36,6 +36,7 @@ public abstract class Task
"The following required Tasks are not done:\n%s", "The following required Tasks are not done:\n%s",
StringUtil.iterableToString(undoneTasks, "\n")); StringUtil.iterableToString(undoneTasks, "\n"));
} else { } else {
isActive = true;
perform(); perform();
isDone = true; isDone = true;
} }
@ -49,12 +50,11 @@ public abstract class Task
} }
public boolean isActive() { return isActive; } public boolean isActive() { return isActive; }
public void setActive(boolean value) { isActive = value; }
public boolean canRun() { public boolean canRun() {
for (Task t : requiredTasks) { if (this.isActive) return false;
if (!t.isDone()) return false; for (Task reqT : requiredTasks) {
if (!reqT.isDone()) return false;
} }
return true; return true;
} }

View File

@ -8,25 +8,30 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
//TODO Maybe I want to make it singleton @"Nullkat"
//TODO Optimize task iteration: If task is not runnable check its requirement tasks
public class TaskManager { public class TaskManager {
private static final List<Task> tasks = new ArrayList<>(); private final List<Task> tasks = new ArrayList<>();
private static final List<Module> modules = new ArrayList<>(); private final List<Module> modules = new ArrayList<>();
private static final ThreadFactory threadFactory = new ThreadFactoryBuilder() private final ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setNameFormat("LogicCore-%d") .setNameFormat("LogicCore-%d")
.build(); .build();
private boolean wakeUpFlag = false;
//Thread pool with size of logical cores of CPU //Thread pool with size of logical cores of CPU
private static final ExecutorService executorService = private final ExecutorService executorService =
Executors.newFixedThreadPool( Executors.newFixedThreadPool(
Runtime.getRuntime().availableProcessors() Runtime.getRuntime().availableProcessors()
, threadFactory); , threadFactory);
public static void registerModule(Module module) { public void registerModule(Module module) {
tasks.addAll(module.getTasks()); tasks.addAll(module.getTasks());
modules.add(module); modules.add(module);
} }
public static void startLoading() { public void startLoading() {
//DEBUG START
Module mod = new Module("Module:Mod"); Module mod = new Module("Module:Mod");
Task task = new Task("Task:Task") { Task task = new Task("Task:Task") {
@Override @Override
@ -35,6 +40,11 @@ public class TaskManager {
while(i < 1000000) { while(i < 1000000) {
i++; i++;
} }
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName()); System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName());
} }
}; };
@ -45,6 +55,11 @@ public class TaskManager {
while(i < 1000000) { while(i < 1000000) {
i++; i++;
} }
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName()); System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName());
} }
}; };
@ -55,6 +70,11 @@ public class TaskManager {
while(i < 1000000) { while(i < 1000000) {
i++; i++;
} }
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName()); System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName());
} }
}; };
@ -62,35 +82,50 @@ public class TaskManager {
mod.addTask(task1); mod.addTask(task1);
mod.addTask(task2); mod.addTask(task2);
registerModule(mod); registerModule(mod);
//DEBUG END
while (!tasks.isEmpty()) { for (int i = 0; i < Runtime.getRuntime().availableProcessors(); i++) {
executorService.submit(() -> { executorService.submit(() -> {
while (true) { while (!tasks.isEmpty()) {
Task t = getRunnableTask(); Task t = getRunnableTask();
if(t == null) { if (t == null) {
break; while (!wakeUpFlag) {
try {
System.out.println(Thread.currentThread().getName() + " go to sleep");
synchronized (tasks) {
tasks.wait();
}
} catch (InterruptedException e) {
e.printStackTrace();
}
}
System.out.println(Thread.currentThread().getName() + " wake up");
wakeUpFlag = false;
} }
else if (!t.isActive()) { else if (!t.isActive()) {
t.setActive(true);
removeTask(t);
t.run(); t.run();
removeTask(t);
wakeUpFlag = true;
synchronized (tasks) {
tasks.notifyAll();
}
} }
//DEBUG
assert t != null;
System.out.println(Thread.currentThread().getName() + " has iterated && Task id:" + t.getId());
} }
System.out.println(Thread.currentThread().getName() + " has been stopped!"); System.out.println(Thread.currentThread().getName() + " has completed its work!");
Thread.yield();
}); });
} }
executorService.shutdownNow();
} }
private static void removeTask(Task task) { private void removeTask(Task task) {
synchronized (tasks) { synchronized (tasks) {
tasks.remove(task); tasks.remove(task);
} }
} }
public static Task getRunnableTask() { public Task getRunnableTask() {
synchronized (tasks) { synchronized (tasks) {
for (Task t : tasks) { for (Task t : tasks) {
if (t.canRun()) return t; if (t.canRun()) return t;