clean Task class and add tests

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/application/ApplicationBootstrap.java

@@ -28,7 +28,7 @@ static void main(Artifact artifact, String[] args, boolean debugMode, Applicatio
 		start.block(0);
 		t.getOutput().block(0);
 		if (t.getOutput().isSuccessful())
-			t.getResult().block(0);
+			t.getOutput().getResult().block(0);
 		LCCore.stop(true);
 	}
 

net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/DynamicLibrariesManager.java

@@ -138,7 +138,7 @@ private void loadSplashFile(File splashFile) {
 		Task<byte[], IOException> read = FullReadFileTask.create(splashFile, Task.Priority.URGENT);
 		read.start();
 		Task<Void,NoException> load = Task.cpu("Loading splash image", Task.Priority.URGENT, () -> {
-			ImageIcon img = new ImageIcon(read.getResult());
+			ImageIcon img = new ImageIcon(read.getOutput().getResult());
 			if (splash == null) return null;
 			synchronized (splash) {
 				while (!splash.isReady())
@@ -303,7 +303,7 @@ private void loadApplicationLibrary(
 			libraries.put(descr.getGroupId() + ':' + descr.getArtifactId(), lib);
 			appLib = lib;
 			Task.cpu("Load library " + lib.descr.getGroupId() + ':' + lib.descr.getArtifactId(), Task.Priority.IMPORTANT,
-				new LoadLibrary(lib, resolveConflicts.getResult(), addPlugins, splash, stepLoad)).start();
+				new LoadLibrary(lib, resolveConflicts.getOutput().getResult(), addPlugins, splash, stepLoad)).start();
 			lib.load.thenStart(Task.cpu("Finishing to initialize", Task.Priority.IMPORTANT, () -> {
 				if (canStartApp.hasError()) return null;
 				app.getDefaultLogger().debug("Libraries initialized.");
@@ -806,7 +806,7 @@ public void run() {
 						Task<Void, NoException> load = Task.cpu(
 							"Load library " + l.descr.getGroupId() + ':' + l.descr.getArtifactId(),
 							Task.Priority.IMPORTANT,
-							new LoadLibrary(l, resolveConflicts.getResult(), null, progress, work));
+							new LoadLibrary(l, resolveConflicts.getOutput().getResult(), null, progress, work));
 						load.start();
 						l.load.onDone(result, () -> l.library);
 					}, result);

net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/Launcher.java

@@ -337,11 +337,11 @@ private static IAsync<Exception> launchApplication(DynamicLibrariesManager libra
 				startApp.getCancelEvent().printStackTrace(System.err);
 			} else {
 				System.err.println("Error while starting application:");
-				startApp.getError().printStackTrace(System.err);
+				startApp.getOutput().getError().printStackTrace(System.err);
 			}
 			return null;
 		}
-		return startApp.getResult();
+		return startApp.getOutput().getResult();
 	}
 
 	private static void start(final SplashScreen splash, final String[] args) {

net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/async/AsyncSupplier.java

@@ -242,7 +242,7 @@ public <T2> AsyncSupplier<T2, TError> thenStart(
 					executable.setInput(res);
 					task.start();
 				},
-				task::setError,
+				err -> task.setDone(null, err),
 				task::cancel
 			);
 		return task.getOutput();
@@ -282,7 +282,7 @@ public IAsync<TError> thenStart(
 					executable.setInput(res);
 					task.start();
 				},
-				task::setError,
+				err -> task.setDone(null, err),
 				task::cancel
 			);
 		return task.getOutput();

net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/tasks/drives/FileAccess.java

@@ -104,7 +104,7 @@ public void close() {
 
 	public long getPosition() throws IOException {
 		if (!openTask.isDone()) return 0;
-		if (!openTask.isSuccessful()) throw openTask.getError();
+		if (!openTask.isSuccessful()) throw openTask.getOutput().getError();
 		return channel.position();
 	}
 
@@ -118,7 +118,7 @@ public void getSize(final AsyncSupplier<Long,IOException> sp) {
 			if (openTask.isSuccessful())
 				sp.unblockSuccess(Long.valueOf(size));
 			else
-				sp.unblockError(openTask.getError());
+				sp.unblockError(openTask.getOutput().getError());
 		};
 		openTask.getOutput().onDone(ready);
 	}

net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/tasks/drives/ReadFile.java

@@ -47,7 +47,7 @@ public ReadFile(
 	@Override
 	public Integer execute() throws IOException, CancelException {
 		if (!file.openTask.isSuccessful())
-			throw file.openTask.getError();
+			throw file.openTask.getOutput().getError();
 		int nbRead = 0;
 		if (pos >= 0)
 			try { file.channel.position(pos); }

net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/threads/Task.java

@@ -151,10 +151,6 @@ public String getDescription() {
 		return description;
 	}
 
-	public void setDescription(String descr) {
-		description = descr;
-	}
-	
 	public Application getApplication() {
 		return app;
 	}
@@ -181,10 +177,6 @@ public Task<T, TError> setMaxBlockingTimeInNanoBeforeToLog(long nano) {
 	// --- status, cancel, error, result ---
 
 
-	public byte getStatus() {
-		return status;
-	}
-	
 	public boolean isDone() {
 		return status == STATUS_DONE && result.isDone();
 	}
@@ -239,19 +231,7 @@ public void cancel(CancelException reason) {
 	@Override
 	public CancelException getCancelEvent() { return cancelling != null ? cancelling : result.getCancelEvent(); }
 
-	/** Set this task's error (MUST NOT be started). */
-	public void setError(TError error) {
-		status = STATUS_DONE;
-		result.unblockError(error);
-	}
-	
-	public boolean hasError() { return result.hasError(); }
-	
-	public TError getError() { return result.getError(); }
-	
-	public T getResult() { return result.getResult(); }
-	
-	public Output getOutput() { return result; }
+	public AsyncSupplier<T, TError> getOutput() { return result; }
 
 	/** Set this task as done with the given result or error. */
 	public void setDone(T result, TError error) {
@@ -478,8 +458,13 @@ void transferTo(TaskManager newManager) {
 	}
 
 	void cancelledBecauseExecutorDied(CancelException reason) {
-		cancelling = reason;
+		if (cancelling != null)
+			reason = cancelling;
+		else
+			cancelling = reason;
 		result.cancel(reason);
+		status = STATUS_DONE;
+		result.cancelled(reason);
 	}
 
 
@@ -571,13 +556,7 @@ public String toString() {
 	}
 
 	/** Synchronization point holding the result or error of this task. */
-	public final class Output extends AsyncSupplier<T, TError> {
-		private Output() {}
-		
-		public Task<T,TError> getTask() {
-			return Task.this;
-		}
-		
+	private final class Output extends AsyncSupplier<T, TError> {
 		@Override
 		public void unblockCancel(CancelException reason) {
 			Task.this.cancel(reason);
@@ -589,7 +568,7 @@ void cancelled(CancelException reason) {
 
 		@Override
 		public String toString() {
-			return "Task synchronization point [" + description + "]";
+			return "Task result [" + description + "]";
 		}
 	}
 
@@ -631,4 +610,32 @@ public static <T, TError extends Exception> Task<T, TError> file(
 		return new Task<>(Threading.getDrivesManager().getTaskManager(file), description, priority, executable, null);
 	}
 
+	/** Create a task using a pool of threads. */
+	public static <T, TError extends Exception> Task<T, TError> unmanaged(
+		String description, Priority priority, Executable<T, TError> executable, Consumer<Pair<T,TError>> ondone
+	) {
+		return new Task<>(Threading.getUnmanagedTaskManager(), description, priority, executable, ondone);
+	}
+	
+	/** Create a task using a pool of threads. */
+	public static <T, TError extends Exception> Task<T, TError> unmanaged(
+		String description, Executable<T, TError> executable, Consumer<Pair<T,TError>> ondone
+	) {
+		return new Task<>(Threading.getUnmanagedTaskManager(), description, null, executable, ondone);
+	}
+	
+	/** Create a task using a pool of threads. */
+	public static <T, TError extends Exception> Task<T, TError> unmanaged(
+		String description, Priority priority, Executable<T, TError> executable
+	) {
+		return new Task<>(Threading.getUnmanagedTaskManager(), description, priority, executable, null);
+	}
+	
+	/** Create a task using a pool of threads. */
+	public static <T, TError extends Exception> Task<T, TError> unmanaged(
+		String description, Executable<T, TError> executable
+	) {
+		return new Task<>(Threading.getUnmanagedTaskManager(), description, null, executable, null);
+	}
+	
 }

net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/threads/TaskManager.java

@@ -46,8 +46,8 @@ public TaskManager(
 
 	public final Object getResource() { return resource; }
 
-	public TaskManagerMonitor.Configuration getMonitorConfiguration() {
-		return monitor.getConfiguration();
+	public TaskManagerMonitor getMonitor() {
+		return monitor;
 	}
 
 	/** Start the threads of this task manager. */
@@ -251,7 +251,7 @@ void putExecutorAside(TaskExecutor executor) {
 		executorAside(executor);
 	}
 
-	@SuppressWarnings({"deprecation", "squid:CallToDeprecatedMethod"})
+	@SuppressWarnings({"deprecation", "squid:CallToDeprecatedMethod", "java:S1181"})
 	void killExecutor(TaskExecutor executor) {
 		synchronized (aside) {
 			if (!aside.remove(executor)) return;
@@ -261,9 +261,14 @@ void killExecutor(TaskExecutor executor) {
 		s.append("Task stopped at \r\n");
 		DebugUtil.createStackTrace(s, stack);
 		Threading.getLogger().error(s.toString());
-		executor.thread.stop();
-		if (executor.getCurrentTask() != null)
-			executor.getCurrentTask().cancel(new CancelException("Task was running since a too long time"));
+		Task<?, ?> task = executor.getCurrentTask();
+		if (task != null)
+			task.cancel(new CancelException("Task was running since a too long time"));
+		try {
+			executor.thread.stop();
+		} catch (Throwable e) {
+			// ignore
+		}		
 	}
 
 	protected abstract void executorUncaughtException(TaskExecutor executor);

net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/threads/TaskManagerMonitor.java

@@ -42,20 +42,28 @@ public Configuration(
 	TaskManagerMonitor(TaskManager manager, Configuration config) {
 		this.manager = manager;
 		this.config = config;
-		Monitor monitor = new Monitor();
-		Thread t = manager.threadFactory.newThread(monitor);
+		thread = new Monitor();
+		Thread t = manager.threadFactory.newThread(thread);
 		t.setName(manager.getName() + " - Task Monitoring");
 		t.start();
-		LCCore.get().toClose(monitor);
+		LCCore.get().toClose(thread);
 	}
 
 	private TaskManager manager;
 	private Configuration config;
+	private Monitor thread;
 
 	public Configuration getConfiguration() {
 		return config;
 	}
 
+	/** Check tasks now. */
+	public void checkNow() {
+		synchronized (thread.lock) {
+			thread.lock.notify();
+		}
+	}
+	
 	private class Monitor implements Runnable, Closeable {
 
 		private Object lock = new Object();
@@ -117,8 +125,7 @@ private long check(TaskExecutor executor) {
 				if (executor.aside) return -1;
 				StringBuilder s = new StringBuilder(2048);
 				startMessage(s, executor, ms);
-				s.append("Task ").append(task).append(" is running since ").append(ms)
-				 .append(" ! put the thread aside and start a new thread, current stack:\r\n");
+				s.append(" ! put the thread aside and start a new thread, current stack:");
 				DebugUtil.createStackTrace(s, executor.thread.getStackTrace());
 				appendLocks(s, executor.thread);
 				Threading.getLogger().warn(s.toString());
@@ -127,7 +134,7 @@ private long check(TaskExecutor executor) {
 			}
 			StringBuilder s = new StringBuilder(2048);
 			startMessage(s, executor, ms);
-			s.append(" ! kill the thread! current stack:\r\n");
+			s.append(" ! kill the thread! current stack:");
 			DebugUtil.createStackTrace(s, executor.thread.getStackTrace());
 			appendLocks(s, executor.thread);
 			Threading.getLogger().error(s.toString());

net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/IOInMemoryOrFile.java

@@ -267,7 +267,7 @@ public AsyncSupplier<Integer,IOException> writeAsync(long pos, ByteBuffer buffer
 			res -> {
 				fil.set(file.writeAsync(0, buffer));
 				IOUtil.listenOnDone(fil.get(), result -> {
-					Integer r = Integer.valueOf(mem.getResult().intValue() + result.intValue());
+					Integer r = Integer.valueOf(mem.getOutput().getResult().intValue() + result.intValue());
 					if (ondone != null) ondone.accept(new Pair<>(r, null));
 					sp.unblockSuccess(r);
 				}, sp, ondone);