X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionAspect.java;h=6d0b9a64e5ad3bbf064c992b84b15e9ee427f2a9;hb=31a8055cac622a55afd2668e77f00aba1d031f91;hp=29942817d4e2343808d6a010a491def5e47bc829;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
index 29942817d..6d0b9a64e 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
@@ -1,59 +1,110 @@
 package org.argeo.slc.core.execution;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionContext;
 import org.argeo.slc.execution.ExecutionFlow;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
+import org.argeo.slc.execution.ExecutionStack;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 
 @Aspect
 public class ExecutionAspect {
-	static ThreadLocal<Boolean> inModuleExecution = new ThreadLocal<Boolean>() {
-		protected Boolean initialValue() {
-			return false;
-		}
-	};
+	private final static Log log = LogFactory.getLog(ExecutionAspect.class);
 
+	private ExecutionStack executionStack;
 	private ExecutionContext executionContext;
 
-	public ExecutionContext getExecutionContext() {
-		return executionContext;
+	@Around("flowExecution()")
+	public void aroundFlow(ProceedingJoinPoint pjp) throws Throwable {
+		// IMPORTANT: Make sure that the execution context is called before the
+		// execution stack
+		executionContext.getUuid();
+
+		ExecutionFlow executionFlow = (ExecutionFlow) pjp.getTarget();
+		executionStack.enterFlow(executionFlow);
+		executionContext.setVariable(ExecutionContext.VAR_FLOW_ID,
+				executionStack.getCurrentStackLevelUuid());
+		executionContext.setVariable(ExecutionContext.VAR_FLOW_NAME,
+				executionFlow.getName());
+
+		if (log.isDebugEnabled())
+			logStackEvent("=> ", executionFlow);
+		
+		try {
+			// Actually execute the flow
+			pjp.proceed();
+		} finally {
+			if (log.isDebugEnabled())
+				logStackEvent("<= ", executionFlow);
+	
+			executionStack.leaveFlow(executionFlow);
+		}
 	}
 
-	public void setExecutionContext(ExecutionContext executionContext) {
-		this.executionContext = executionContext;
+	@Around("runnableExecution()")
+	public void aroundRunnable(ProceedingJoinPoint pjp) throws Throwable {
+		ExecutionFlow executionFlow = (ExecutionFlow) pjp.getTarget();
+		Runnable runnable = (Runnable) pjp.getArgs()[0];
+		if (log.isDebugEnabled())
+			logRunnableExecution(executionFlow, runnable);
+		// Actually execute the runnable
+		pjp.proceed();
 	}
 
-	@Before("flowExecution()")
-	public void beforeFlow(JoinPoint jp) throws Throwable {
-		ExecutionFlow executionFlow = (ExecutionFlow) jp.getTarget();
-		executionContext.enterFlow(executionFlow);
+	@Around("getVariable()")
+	public Object aroundGetVariable(ProceedingJoinPoint pjp) throws Throwable {
+		Object obj = pjp.proceed();
+		// if the variable was not found, look in the stack starting at the
+		// upper flows
+		if (obj == null) {
+			String key = pjp.getArgs()[0].toString();
+			obj = executionStack.findLocalVariable(key);
+		}
+		return obj;
 	}
 
-	@After("flowExecution()")
-	public void afterFlow(JoinPoint jp) throws Throwable {
-		ExecutionFlow executionFlow = (ExecutionFlow) jp.getTarget();
-		executionContext.leaveFlow(executionFlow);
+	@Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.run())")
+	public void flowExecution() {
 	}
 
-	@Before("moduleExecution()")
-	public void beforeModuleExecution(JoinPoint jp) throws Throwable {
-		inModuleExecution.set(true);
+	@Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.doExecuteRunnable(..))")
+	public void runnableExecution() {
 	}
 
-	@After("moduleExecution()")
-	public void afterModuleExecution(JoinPoint jp) throws Throwable {
-		inModuleExecution.set(false);
+	@Pointcut("execution(* org.argeo.slc.execution.ExecutionContext.getVariable(..))")
+	public void getVariable() {
 	}
 
-	@Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.run())")
-	public void flowExecution() {
+	public void setExecutionStack(ExecutionStack executionStack) {
+		this.executionStack = executionStack;
+	}
+
+	public void setExecutionContext(ExecutionContext executionContext) {
+		this.executionContext = executionContext;
+	}
+
+	protected void logStackEvent(String symbol, ExecutionFlow executionFlow) {
+		Integer stackSize = executionStack.getStackSize();
+		log.debug(depthSpaces(stackSize) + symbol + executionFlow + " #"
+				+ executionStack.getCurrentStackLevelUuid() + ", depth="
+				+ stackSize);
+	}
+
+	protected void logRunnableExecution(ExecutionFlow executionFlow,
+			Runnable runnable) {
+		Integer stackSize = executionStack.getStackSize();
+		log.debug(depthSpaces(stackSize + 1)
+				+ runnable.getClass().getSimpleName() + " in " + executionFlow);
 	}
 
-	@Pointcut("execution(void org.argeo.slc.execution.ExecutionModule.execute(..))")
-	public void moduleExecution() {
+	private String depthSpaces(int depth) {
+		StringBuffer buf = new StringBuffer(depth * 2);
+		for (int i = 0; i < depth; i++)
+			buf.append("  ");
+		return buf.toString();
 	}
 
 }