X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FProcessThread.java;h=c11e875b8083df0d627c51dba32587360bdfed22;hb=32f9566efa0d0ce29b31ee0779faf2b42f46321a;hp=7c0e7b10db0a4d3a7111916041b1f134d3676c77;hpb=30f4c6af6c20077e5e36b61faf5edb22c1aae6c6;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
index 7c0e7b10d..c11e875b8 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
@@ -17,11 +17,16 @@
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.process.RealizedFlow;
 import org.argeo.slc.process.SlcExecution;
 
@@ -30,60 +35,120 @@ public class ProcessThread extends Thread {
 	private final static Log log = LogFactory.getLog(ProcessThread.class);
 
 	private final ExecutionModulesManager executionModulesManager;
-	private final SlcExecution slcProcess;
+	private final ExecutionProcess process;
 	private final ProcessThreadGroup processThreadGroup;
-	private final List<RealizedFlow> flowsToProcess = new ArrayList<RealizedFlow>();
+
+	private Set<ExecutionThread> executionThreads = Collections
+			.synchronizedSet(new HashSet<ExecutionThread>());
 
 	private Boolean hadAnError = false;
+	private Boolean killed = false;
 
-	public ProcessThread(ExecutionModulesManager executionModulesManager,
-			SlcExecution slcExecution) {
-		super(executionModulesManager.getProcessesThreadGroup(),
-				"SLC Process #" + slcExecution.getUuid());
+	public ProcessThread(ThreadGroup processesThreadGroup,
+			ExecutionModulesManager executionModulesManager,
+			ExecutionProcess process) {
+		super(processesThreadGroup, "SLC Process #" + process.getUuid());
 		this.executionModulesManager = executionModulesManager;
-		this.slcProcess = slcExecution;
+		this.process = process;
 		processThreadGroup = new ProcessThreadGroup(executionModulesManager,
 				this);
 	}
 
-	public void run() {
-		log.info("\n##\n## SLC Process " + slcProcess + " STARTED\n##");
+	public final void run() {
+		log.info("\n##\n## SLC Process #" + process.getUuid()
+				+ " STARTED\n##\n");
 
-		slcProcess.setStatus(SlcExecution.STATUS_RUNNING);
-		executionModulesManager.dispatchUpdateStatus(slcProcess,
-				SlcExecution.STATUS_SCHEDULED, SlcExecution.STATUS_RUNNING);
+		String oldStatus = process.getStatus();
+		process.setStatus(ExecutionProcess.RUNNING);
+		executionModulesManager.dispatchUpdateStatus(process, oldStatus,
+				ExecutionProcess.RUNNING);
 
-		flowsToProcess.addAll(slcProcess.getRealizedFlows());
+		try {
+			process();
+		} catch (InterruptedException e) {
+			die();
+			return;
+		}
 
-		while (flowsToProcess.size() > 0) {
-			RealizedFlow flow = flowsToProcess.remove(0);
-			ExecutionThread thread = new ExecutionThread(this, flow);
-			thread.start();
+		// waits for all execution threads to complete (in case they were
+		// started asynchronously)
+		for (ExecutionThread executionThread : executionThreads) {
+			if (executionThread.isAlive()) {
+				try {
+					executionThread.join();
+				} catch (InterruptedException e) {
+					die();
+					return;
+				}
+			}
+		}
+
+		computeFinalStatus();
+	}
+
+	/** Make sure this is called BEFORE all the threads are interrupted. */
+	private void computeFinalStatus() {
+		String oldStatus = process.getStatus();
+		// TODO: error management at flow level?
+		if (killed)
+			process.setStatus(ExecutionProcess.KILLED);
+		else if (hadAnError)
+			process.setStatus(ExecutionProcess.ERROR);
+		else
+			process.setStatus(ExecutionProcess.COMPLETED);
+		executionModulesManager.dispatchUpdateStatus(process, oldStatus,
+				process.getStatus());
+		log.info("\n## SLC Process #" + process.getUuid() + " "
+				+ process.getStatus() + "\n");
+	}
 
+	/** Called when being killed */
+	private synchronized void die() {
+		killed = true;
+		computeFinalStatus();
+		for (ExecutionThread executionThread : executionThreads) {
 			try {
-				thread.join();
-			} catch (InterruptedException e) {
-				log.error("Flow " + flow + " was interrupted", e);
+				executionThread.interrupt();
+			} catch (Exception e) {
+				log.error("Cannot interrupt " + executionThread);
 			}
+		}
+		processThreadGroup.interrupt();
+	}
 
-			// synchronized (this) {
-			// try {
-			// wait();
-			// } catch (InterruptedException e) {
-			// // silent
-			// }
-			// }
+	/**
+	 * Implementation specific execution. To be overridden in order to deal with
+	 * custom process types. Default expects an {@link SlcExecution}.
+	 */
+	@SuppressWarnings("deprecation")
+	protected void process() throws InterruptedException {
+		if (!(process instanceof SlcExecution))
+			throw new SlcException("Unsupported process type "
+					+ process.getClass());
+		SlcExecution slcExecution = (SlcExecution) process;
+		List<RealizedFlow> flowsToProcess = new ArrayList<RealizedFlow>();
+		flowsToProcess.addAll(slcExecution.getRealizedFlows());
+
+		while (flowsToProcess.size() > 0) {
+			RealizedFlow realizedFlow = flowsToProcess.remove(0);
+			execute(realizedFlow, true);
 		}
+	}
 
-		// TODO: error management at flow level?
-		if (hadAnError)
-			slcProcess.setStatus(SlcExecution.STATUS_ERROR);
-		else
-			slcProcess.setStatus(SlcExecution.STATUS_FINISHED);
-		executionModulesManager.dispatchUpdateStatus(slcProcess,
-				SlcExecution.STATUS_RUNNING, slcProcess.getStatus());
+	/** @return the (distinct) thread used for this execution */
+	protected final void execute(RealizedFlow realizedFlow, Boolean synchronous)
+			throws InterruptedException {
+		if (killed)
+			return;
+
+		ExecutionThread thread = new ExecutionThread(this, realizedFlow);
+		executionThreads.add(thread);
+		thread.start();
+
+		if (synchronous)
+			thread.join();
 
-		log.info("## SLC Process " + slcProcess + " COMPLETED");
+		return;
 	}
 
 	public void notifyError() {
@@ -94,8 +159,8 @@ public class ProcessThread extends Thread {
 		// notifyAll();
 	}
 
-	public SlcExecution getSlcProcess() {
-		return slcProcess;
+	public ExecutionProcess getProcess() {
+		return process;
 	}
 
 	public ProcessThreadGroup getProcessThreadGroup() {