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=dc9e7efdd8a1233d01c1ea7f05e0d69d41c34d92;hb=86c47402780f41526382267ff1597d2f3a0d0dd7;hp=678e6f679ae809322e81125b79fece1074489a50;hpb=a91feabac0f3f603a73936b4447599402fba71d0;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 678e6f679..dc9e7efdd 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
@@ -1,84 +1,149 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+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;
-import org.argeo.slc.process.SlcExecutionNotifier;
 
 /** Thread of the SLC Process, starting the sub executions. */
 public class ProcessThread extends Thread {
 	private final static Log log = LogFactory.getLog(ProcessThread.class);
 
-	private final AbstractExecutionModulesManager executionModulesManager;
-	private final SlcExecution slcProcess;
-	private final ThreadGroup processThreadGroup;
-	private final List<RealizedFlow> flowsToProcess = new ArrayList<RealizedFlow>();
+	private final ExecutionModulesManager executionModulesManager;
+	private final ExecutionProcess process;
+	private final ProcessThreadGroup processThreadGroup;
+
+	private Set<ExecutionThread> executionThreads = new HashSet<ExecutionThread>();
 
-	public ProcessThread(
-			AbstractExecutionModulesManager executionModulesManager,
-			SlcExecution slcExecution) {
+	private Boolean hadAnError = false;
+
+	public ProcessThread(ExecutionModulesManager executionModulesManager,
+			ExecutionProcess process) {
 		super(executionModulesManager.getProcessesThreadGroup(),
-				"SLC Process #" + slcExecution.getUuid());
+				"SLC Process #" + process.getUuid());
 		this.executionModulesManager = executionModulesManager;
-		this.slcProcess = slcExecution;
-		processThreadGroup = new ThreadGroup("SLC Process #"
-				+ slcExecution.getUuid() + " thread group");
+		this.process = process;
+		processThreadGroup = new ProcessThreadGroup(executionModulesManager,
+				this);
 	}
 
 	public void run() {
-		log.info("\n##\n## Process SLC Execution " + slcProcess + "\n##\n");
+		log.info("\n##\n## SLC Process #" + process.getUuid()
+				+ " STARTED\n##\n");
 
-		slcProcess.setStatus(SlcExecution.STATUS_RUNNING);
-		dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_SCHEDULED,
-				SlcExecution.STATUS_RUNNING);
+		process.setStatus(SlcExecution.RUNNING);
+		executionModulesManager.dispatchUpdateStatus(process,
+				SlcExecution.SCHEDULED, SlcExecution.RUNNING);
 
-		flowsToProcess.addAll(slcProcess.getRealizedFlows());
+		process();
 
-		while (flowsToProcess.size() > 0) {
-			RealizedFlow flow = flowsToProcess.remove(0);
-			ExecutionThread thread = new ExecutionThread(this, flow);
-			thread.start();
-
-			synchronized (this) {
+		// waits for all execution threads to complete (in case they were
+		// started asynchronously)
+		for (ExecutionThread executionThread : executionThreads) {
+			if (executionThread.isAlive()) {
 				try {
-					wait();
+					executionThread.join();
 				} catch (InterruptedException e) {
-					// silent
+					log.error("Execution thread " + executionThread
+							+ " was interrupted");
 				}
 			}
 		}
 
-		slcProcess.setStatus(SlcExecution.STATUS_FINISHED);
-		dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_RUNNING,
-				SlcExecution.STATUS_FINISHED);
+		// TODO: error management at flow level?
+		if (hadAnError)
+			process.setStatus(SlcExecution.ERROR);
+		else
+			process.setStatus(SlcExecution.COMPLETED);
+		executionModulesManager.dispatchUpdateStatus(process,
+				SlcExecution.RUNNING, process.getStatus());
+
+		log.info("\n## SLC Process #" + process.getUuid() + " COMPLETED\n");
+	}
+
+	/**
+	 * Implementation specific execution. To be overridden in order to deal with
+	 * custom process types. Default expects an {@link SlcExecution}.
+	 */
+	protected void process() {
+		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);
+		}
 	}
 
-	protected void dispatchUpdateStatus(SlcExecution slcExecution,
-			String oldStatus, String newStatus) {
-		for (Iterator<SlcExecutionNotifier> it = executionModulesManager
-				.getSlcExecutionNotifiers().iterator(); it.hasNext();) {
-			it.next().updateStatus(slcExecution, oldStatus, newStatus);
+	/** @return the (distinct) thread used for this execution */
+	protected Thread execute(RealizedFlow realizedFlow, Boolean synchronous) {
+		ExecutionThread thread = new ExecutionThread(this, realizedFlow);
+		executionThreads.add(thread);
+		thread.start();
+
+		if (synchronous) {
+			try {
+				thread.join();
+			} catch (InterruptedException e) {
+				log.error("Flow " + realizedFlow + " was interrupted", e);
+			}
 		}
+		return thread;
+
+		// synchronized (this) {
+		// try {
+		// wait();
+		// } catch (InterruptedException e) {
+		// // silent
+		// }
+		// }
+	}
+
+	public void notifyError() {
+		hadAnError = true;
 	}
 
 	public synchronized void flowCompleted() {
-		notifyAll();
+		// notifyAll();
 	}
 
-	public SlcExecution getSlcProcess() {
-		return slcProcess;
+	public ExecutionProcess getProcess() {
+		return process;
 	}
 
-	public ThreadGroup getProcessThreadGroup() {
+	public ProcessThreadGroup getProcessThreadGroup() {
 		return processThreadGroup;
 	}
 
-	public AbstractExecutionModulesManager getExecutionModulesManager() {
+	public ExecutionModulesManager getExecutionModulesManager() {
 		return executionModulesManager;
 	}
 }