Removed debug code
This commit is contained in:
parent
e795d76367
commit
56e9be727b
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
package ru.windcorp.progressia;
|
package ru.windcorp.progressia;
|
||||||
|
|
||||||
import ru.windcorp.progressia.common.modules.Task;
|
|
||||||
import ru.windcorp.progressia.common.modules.TaskManager;
|
import ru.windcorp.progressia.common.modules.TaskManager;
|
||||||
import ru.windcorp.progressia.common.util.crash.CrashReports;
|
import ru.windcorp.progressia.common.util.crash.CrashReports;
|
||||||
import ru.windcorp.progressia.common.util.crash.analyzers.OutOfMemoryAnalyzer;
|
import ru.windcorp.progressia.common.util.crash.analyzers.OutOfMemoryAnalyzer;
|
||||||
@ -32,8 +31,7 @@ public class ProgressiaLauncher {
|
|||||||
arguments = args.clone();
|
arguments = args.clone();
|
||||||
setupCrashReports();
|
setupCrashReports();
|
||||||
proxy.initialize();
|
proxy.initialize();
|
||||||
TaskManager tm = new TaskManager();
|
TaskManager.getInstance().startLoading();
|
||||||
tm.startLoading();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void setupCrashReports() {
|
private static void setupCrashReports() {
|
||||||
|
@ -32,7 +32,7 @@ public class Module extends Namespaced {
|
|||||||
/**
|
/**
|
||||||
* @return false - not all tasks are done
|
* @return false - not all tasks are done
|
||||||
*/
|
*/
|
||||||
public boolean setDone() {
|
public boolean done() {
|
||||||
for (Task t : tasks) {
|
for (Task t : tasks) {
|
||||||
if (!t.isDone()) {
|
if (!t.isDone()) {
|
||||||
return false;
|
return false;
|
||||||
@ -41,8 +41,4 @@ public class Module extends Namespaced {
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDone() {
|
|
||||||
return done;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
package ru.windcorp.progressia.common.modules;
|
package ru.windcorp.progressia.common.modules;
|
||||||
|
|
||||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||||
|
import ru.windcorp.progressia.common.util.crash.CrashReports;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ExecutorService;
|
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;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
//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 TaskManager instance = new TaskManager();
|
||||||
private final List<Task> tasks = new ArrayList<>();
|
private final List<Task> tasks = new ArrayList<>();
|
||||||
private final List<Module> modules = new ArrayList<>();
|
private final List<Module> modules = new ArrayList<>();
|
||||||
private final ThreadFactory threadFactory = new ThreadFactoryBuilder()
|
private final ThreadFactory threadFactory = new ThreadFactoryBuilder()
|
||||||
@ -19,6 +19,12 @@ public class TaskManager {
|
|||||||
.build();
|
.build();
|
||||||
private boolean wakeUpFlag = false;
|
private boolean wakeUpFlag = false;
|
||||||
|
|
||||||
|
private TaskManager() {}
|
||||||
|
|
||||||
|
public static TaskManager getInstance() {
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
//Thread pool with size of logical cores of CPU
|
//Thread pool with size of logical cores of CPU
|
||||||
private final ExecutorService executorService =
|
private final ExecutorService executorService =
|
||||||
Executors.newFixedThreadPool(
|
Executors.newFixedThreadPool(
|
||||||
@ -31,59 +37,7 @@ public class TaskManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startLoading() {
|
public void startLoading() {
|
||||||
//DEBUG START
|
System.out.println("Loader is started");
|
||||||
Module mod = new Module("Module:Mod");
|
|
||||||
Task task = new Task("Task:Task") {
|
|
||||||
@Override
|
|
||||||
protected void perform() {
|
|
||||||
int i = 0;
|
|
||||||
while(i < 1000000) {
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
Thread.sleep(5000);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Task task1 = new Task("Task:Task1") {
|
|
||||||
@Override
|
|
||||||
protected void perform() {
|
|
||||||
int i = 0;
|
|
||||||
while(i < 1000000) {
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
Thread.sleep(5000);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Task task2 = new Task("Task:Task2") {
|
|
||||||
@Override
|
|
||||||
protected void perform() {
|
|
||||||
int i = 0;
|
|
||||||
while(i < 1000000) {
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
Thread.sleep(5000);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
System.out.println("Task " + getId() + "has been performed by" + Thread.currentThread().getName());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
mod.addTask(task);
|
|
||||||
mod.addTask(task1);
|
|
||||||
mod.addTask(task2);
|
|
||||||
registerModule(mod);
|
|
||||||
//DEBUG END
|
|
||||||
|
|
||||||
for (int i = 0; i < Runtime.getRuntime().availableProcessors(); i++) {
|
for (int i = 0; i < Runtime.getRuntime().availableProcessors(); i++) {
|
||||||
executorService.submit(() -> {
|
executorService.submit(() -> {
|
||||||
while (!tasks.isEmpty()) {
|
while (!tasks.isEmpty()) {
|
||||||
@ -91,7 +45,6 @@ public class TaskManager {
|
|||||||
if (t == null) {
|
if (t == null) {
|
||||||
while (!wakeUpFlag) {
|
while (!wakeUpFlag) {
|
||||||
try {
|
try {
|
||||||
System.out.println(Thread.currentThread().getName() + " go to sleep");
|
|
||||||
synchronized (tasks) {
|
synchronized (tasks) {
|
||||||
tasks.wait();
|
tasks.wait();
|
||||||
}
|
}
|
||||||
@ -99,7 +52,6 @@ public class TaskManager {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println(Thread.currentThread().getName() + " wake up");
|
|
||||||
wakeUpFlag = false;
|
wakeUpFlag = false;
|
||||||
}
|
}
|
||||||
else if (!t.isActive()) {
|
else if (!t.isActive()) {
|
||||||
@ -110,13 +62,25 @@ public class TaskManager {
|
|||||||
tasks.notifyAll();
|
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 completed its work!");
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (Module m : modules) {
|
||||||
|
if (!m.done()) {
|
||||||
|
throw CrashReports.crash(new Exception("Modules loading failed"),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while(true) {
|
||||||
|
try {
|
||||||
|
executorService.shutdown();
|
||||||
|
if (executorService.awaitTermination(5, TimeUnit.SECONDS)) break;
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
System.out.println("Loader has completed its job");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void removeTask(Task task) {
|
private void removeTask(Task task) {
|
||||||
|
Reference in New Issue
Block a user