September 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2604 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 09:26:02 +0000 (Mon, 14 Sep 2009) New Revision: 2604 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Add log message on linkage error Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-14 08:47:30 UTC (rev 2603) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-14 09:26:02 UTC (rev 2604) @@ -148,6 +148,11 @@ e.printStackTrace(); quit(); } catch (LinkageError e) { + + if (log.isFatalEnabled()) { + log.fatal("Linkage error detected", e); + } + // a real java.lang.Error sometimes happen when // using non recompiled script due to dependency changes // this is the better solution found :

1 0

r2603 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 08:47:30 +0000 (Mon, 14 Sep 2009) New Revision: 2603 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-14 08:33:38 UTC (rev 2602) +++ isis-fish/trunk/changelog.txt 2009-09-14 08:47:30 UTC (rev 2603) @@ -1,5 +1,7 @@ isis-fish (3.2.0.6) stable; urgency=low + * Fix force parameter when adding result with coposed names + * Fix a little trace util object for both Cache and Trace aspect * Add aspect to get rule time (init/pre/post) in simulation summary --

1 0

r2602 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by bpoussin＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: bpoussin Date: 2009-09-14 08:33:38 +0000 (Mon, 14 Sep 2009) New Revision: 2602 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Log: - bug fix if in addResult pop name is added Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-09-11 10:17:20 UTC (rev 2601) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-09-14 08:33:38 UTC (rev 2602) @@ -186,7 +186,12 @@ } public void addResult(boolean force, Date date, String name, Population pop, MatrixND mat) throws IsisFishException{ - addResult(force, date, name + " " + pop, mat); + // don't call generic addResult, because pop name is added + if (force || isEnabled(name)) { + for (SimulationResultListener l : listeners) { + l.addResult(context, date, name + " " + pop, mat); + } + } } public void addResult(boolean force, Date date, String name, MatrixND mat) throws IsisFishException{

1 0

r2601 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect
by chatellier＠users.labs.libre-entreprise.org 11 Sep '09

11 Sep '09

Author: chatellier Date: 2009-09-11 10:17:20 +0000 (Fri, 11 Sep 2009) New Revision: 2601 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java Log: Update aspect package info. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-09-11 10:16:31 UTC (rev 2600) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-09-11 10:17:20 UTC (rev 2601) @@ -5,6 +5,7 @@ * <ul> * <li>{@link fr.ifremer.isisfish.aspect.Cache} : cache aspect</li> * <li>{@link fr.ifremer.isisfish.aspect.Trace} : trace expect</li> + * <li>{@link fr.ifremer.isisfish.aspect.RuleAspect} : rule timing aspect</li> * </ul> */ package fr.ifremer.isisfish.aspect;

1 0

r2600 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect
by chatellier＠users.labs.libre-entreprise.org 11 Sep '09

11 Sep '09

Author: chatellier Date: 2009-09-11 10:16:31 +0000 (Fri, 11 Sep 2009) New Revision: 2600 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java Log: Throw runtime exception if there is no trace object in context. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:13:35 UTC (rev 2599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:16:31 UTC (rev 2600) @@ -39,6 +39,7 @@ import org.codehaus.aspectwerkz.joinpoint.MethodRtti; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -83,6 +84,11 @@ fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + + if (result == null) { + throw new IsisFishRuntimeException("No trace object found in context"); + } + return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:13:35 UTC (rev 2599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:16:31 UTC (rev 2600) @@ -34,6 +34,7 @@ import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -79,6 +80,11 @@ fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + + if (result == null) { + throw new IsisFishRuntimeException("No trace object found in context"); + } + return result; }

1 0

r2599 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: aspect simulator/launcher util
by chatellier＠users.labs.libre-entreprise.org 11 Sep '09

11 Sep '09

Author: chatellier Date: 2009-09-11 10:13:35 +0000 (Fri, 11 Sep 2009) New Revision: 2599 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Trace.java Log: Give a common trace object for both aspects (Cache/Trace) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 09:27:55 UTC (rev 2598) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:13:35 UTC (rev 2599) @@ -39,6 +39,8 @@ import org.codehaus.aspectwerkz.joinpoint.MethodRtti; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.simulator.SimulationContext; + /** * Cache aspect. * @@ -71,6 +73,19 @@ instances.add(this); } + /** + * Return trace object from context. + * + * @return trace object from context + */ + protected fr.ifremer.isisfish.util.Trace getTrace() { + SimulationContext context = SimulationContext.get(); + + fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context + .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + return result; + } + // @Before("scriptsMethod") // public void traceBeforeExecute (JoinPoint jp) { // System.out.println("before !!!"); @@ -94,9 +109,10 @@ Object result = cache.get(key); if (result == null) { - // FIXME computation increment (/ by 0) + // computation increment (/ by 0) + // FIXME need to be called, but fail with empty stack //Method method = ((MethodSignature)jp.getSignature()).getMethod(); - //trace.traceAfterComputation(method); + //getTrace().traceAfterComputation(method); result = realCall(jp); // addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 09:27:55 UTC (rev 2598) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:13:35 UTC (rev 2599) @@ -34,6 +34,8 @@ import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.simulator.SimulationContext; + /** * Permet de tracer les appels aux methodes utilisateur ainsi que l'execution * a ces methodes. La difference entre les deux est lors de l'utilisation du @@ -53,53 +55,61 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(Trace.class); - + static private List<Trace> instances = new ArrayList<Trace>(); - - protected fr.ifremer.isisfish.util.Trace trace = new fr.ifremer.isisfish.util.Trace(""); - - @Expression( - "execution(* scripts..*(..))" + - " || execution(* simulators..*(..))" + - " || execution(* rules..*(..)) " + - " || execution(* analyseplans..*(..)) " + - " || execution(* formules..*(..))" - ) + + @Expression("execution(* scripts..*(..))" + + " || execution(* simulators..*(..))" + + " || execution(* rules..*(..)) " + + " || execution(* analyseplans..*(..)) " + + " || execution(* formules..*(..))") Pointcut executeMethod; - + public Trace() { instances.add(this); } - + + /** + * Return trace object from context. + * + * @return trace object from context + */ + protected fr.ifremer.isisfish.util.Trace getTrace() { + SimulationContext context = SimulationContext.get(); + + fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context + .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + return result; + } + @Before("executeMethod") - public void traceBeforeExecute (JoinPoint jp) { - trace.traceBefore(); + public void traceBeforeExecute(JoinPoint jp) { + getTrace().traceBefore(); } - - @AfterThrowing(type="Exception",pointcut="executeMethod") - public void traceAfterThrowingExecute (JoinPoint jp) { + + @AfterThrowing(type = "Exception", pointcut = "executeMethod") + public void traceAfterThrowingExecute(JoinPoint jp) { // si une exeption est leve, il faut faire la meme chose traceAfterExecute(jp); } - + @After("executeMethod") - public void traceAfterExecute (JoinPoint jp) { - Method method = ((MethodSignature)jp.getSignature()).getMethod(); - trace.traceAfterCall(method); + public void traceAfterExecute(JoinPoint jp) { + Method method = ((MethodSignature) jp.getSignature()).getMethod(); + getTrace().traceAfterCall(method); } /** * Affiche les statistiques * + * @return statistics as string */ - static public String printStatistiqueAndClear() { + public static String printStatistiqueAndClear() { StringBuffer result = new StringBuffer(); for (Trace trace : instances) { - result.append(trace.trace.printStatisticAndClear()); + result.append(trace.getTrace().printStatisticAndClear()); } instances.clear(); return result.toString(); } } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-11 09:27:55 UTC (rev 2598) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-11 10:13:35 UTC (rev 2599) @@ -344,15 +344,23 @@ // // Activation de l'OAP demandée // - if (parameters.getUseStatistic()) { - message(control, _("isisfish.message.setting.trace.aspects")); - classLoader.deploy(Trace.class); + if (parameters.getUseStatistic() || parameters.getUseOptimization()) { + + // il est necessaire de passer un object trace/cache + // commun, donc on le met dans le context + // pas moyen de le passer autrement plus simplement + fr.ifremer.isisfish.util.Trace traceObject = new fr.ifremer.isisfish.util.Trace(""); + context.setValue(fr.ifremer.isisfish.util.Trace.class.getName(), traceObject); + + if (parameters.getUseStatistic()) { + message(control, _("isisfish.message.setting.trace.aspects")); + classLoader.deploy(Trace.class); + } + if (parameters.getUseOptimization()) { + message(control, _("isisfish.message.setting.cache.aspects")); + classLoader.deploy(Cache.class); + } } - if (parameters.getUseOptimization()) { - message(control, _("isisfish.message.setting.cache.aspects")); - classLoader.deploy(Cache.class); - } - // recherche du simulateur a utiliser String simulatorName = parameters.getSimulatorName(); @@ -440,8 +448,6 @@ } } - SimulationContext.remove(); - // // Affichage des statistiques // @@ -459,6 +465,8 @@ simulation.getInformation().setOptimizationUsage(cache); } + // context is used in Trace.printStatistiqueAndClear() + SimulationContext.remove(); } return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Trace.java 2009-09-11 09:27:55 UTC (rev 2598) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Trace.java 2009-09-11 10:13:35 UTC (rev 2599) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -95,10 +95,10 @@ callStack.push(stackItem); } - public void traceAfterCall (Object e) { + public void traceAfterCall(Object e) { traceAfter(e, false); } - public void traceAfterComputation (Object e) { + public void traceAfterComputation(Object e) { traceAfter(e, true); } @@ -166,7 +166,7 @@ long[] stat = getStatistics(e); // fix / by zero - // FIXME need to be fixed in aspect !!! + // if Cache aspect has not been selected if (stat[STAT_COMPUTATION] == 0) { stat[STAT_COMPUTATION] = stat[STAT_CALL]; }

1 0

r2598 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/aspect src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 11 Sep '09

11 Sep '09

Author: chatellier Date: 2009-09-11 09:27:55 +0000 (Fri, 11 Sep 2009) New Revision: 2598 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java Log: Add rule time aspect. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-11 09:27:25 UTC (rev 2597) +++ isis-fish/trunk/changelog.txt 2009-09-11 09:27:55 UTC (rev 2598) @@ -1,5 +1,7 @@ isis-fish (3.2.0.6) stable; urgency=low + * Add aspect to get rule time (init/pre/post) in simulation summary + -- isis-fish (3.2.0.5) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-09-11 09:27:25 UTC (rev 2597) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2009-09-11 09:27:55 UTC (rev 2598) @@ -43,8 +43,10 @@ import sun.misc.URLClassPath; /** - * AspectClassLoader. + * Aspectwerkz class loader. * + * http://aspectwerkz.codehaus.org/xref/org/codehaus/aspectwerkz/transform/inl… + * * Created: 30 mars 07 00:31:22 * * @author poussin @@ -54,12 +56,20 @@ * by : $Author$ */ public class AspectClassLoader extends URLClassLoader { + + /** + * Class loader constructor. + * + * @param urls parent urlclassloader url + * @param parent parent class loader + */ public AspectClassLoader(URL[] urls, ClassLoader parent) { super(urls, parent); ClassPreProcessorHelper.initializePreProcessor(); } - protected Class findClass(String name) throws ClassNotFoundException { + @Override + protected Class<?> findClass(String name) throws ClassNotFoundException { String path = name.replace('.', '/').concat(".class"); URLClassPath ucp = new URLClassPath(getURLs()); Resource res = ucp.getResource(path, false); @@ -70,47 +80,48 @@ byte[] transformed = ClassPreProcessorHelper.defineClass0Pre(this, name, b, 0, b.length, null); return defineClass(name, transformed, 0, transformed.length); } catch (IOException e) { - throw new ClassNotFoundException(e.getMessage()); + throw new ClassNotFoundException("Can't build aspect for class", e); } } else { throw new ClassNotFoundException(name); } } - public void deploy(Class aspectClass) { + /** + * Register new aspect. + * + * @param aspectClass aspect class to register + */ + public void deploy(Class<?> aspectClass) { String className = aspectClass.getName(); try { aspectClass = Class.forName(className, false, this); } catch (ClassNotFoundException e) { - throw new RuntimeException( - "could not load class [" + className + "] in class loader [" + this + "]" - ); + throw new RuntimeException("could not load class [" + className + "] in class loader [" + this + "]"); } - final ClassInfo aspectClassInfo = JavaClassInfo.getClassInfo(aspectClass); // create a new aspect def and fill it up with the annotation def from the aspect class final SystemDefinition systemDef = SystemDefinitionContainer.getVirtualDefinitionAt(this); final AspectDefinition newAspectDef = new AspectDefinition(className, aspectClassInfo, systemDef); - final Set newExpressions = getNewExpressionsForAspect( - aspectClass, newAspectDef, systemDef, DeploymentScope.MATCH_ALL); - + getNewExpressionsForAspect(aspectClass, newAspectDef, systemDef, DeploymentScope.MATCH_ALL); } /** * Returns a set with the new expressions for the advice in the aspect to deploy. * - * @param aspectClass s * @param newAspectDef + * @param aspectClass * @param newAspectDef + * @param newAspectDef * @param systemDef * @param deploymentScope * @return a set with the new expressions */ private Set getNewExpressionsForAspect(final Class aspectClass, - final AspectDefinition newAspectDef, - final SystemDefinition systemDef, - final DeploymentScope deploymentScope) { + final AspectDefinition newAspectDef, + final SystemDefinition systemDef, + final DeploymentScope deploymentScope) { final ClassLoader aspectLoader = aspectClass.getClassLoader(); final String aspectName = aspectClass.getName(); @@ -136,7 +147,7 @@ if (oldExpression == null) { continue; } -// deploymentHandle.registerDefinitionChange(adviceDef, oldExpression); + // deploymentHandle.registerDefinitionChange(adviceDef, oldExpression); final ExpressionInfo newExpression = deploymentScope.newExpressionInfo(oldExpression); adviceDef.setExpressionInfo(newExpression); @@ -144,5 +155,4 @@ } return newExpressions; } - } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2009-09-11 09:27:55 UTC (rev 2598) @@ -0,0 +1,177 @@ +/* *##% + * Copyright (C) 2009 Ifremer, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.aspect; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codehaus.aspectwerkz.annotation.Around; +import org.codehaus.aspectwerkz.annotation.Aspect; +import org.codehaus.aspectwerkz.joinpoint.JoinPoint; + +import fr.ifremer.isisfish.datastore.SimulationInformation; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.Date; + +/** + * Aspect utiliser pour intersepecter les appels a + * {@link Rule#init(SimulationContext)}, {@link Rule#preAction(SimulationContext, Date, Metier)}, + * {@link Rule#postAction(SimulationContext, Date, Metier)} et memoriser + * le temps mit. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ + at Aspect("perInstance") +public class RuleAspect { + + /** + * State phase to register. + */ + protected static enum State { + INIT, PRE, POST + } + + /** Log. */ + private static Log log = LogFactory.getLog(RuleAspect.class); + + /** + * Aspect around {@link Rule#init(SimulationContext)} in packages "rules". + * + * @param jp join point + * @return init result + * @throws Throwable + */ + @Around("execution(* rules.*.init(..))") + public Object initCall(final JoinPoint jp) throws Throwable { + + Object result = makeTimedCall(jp, State.INIT); + return result; + + } + + /** + * Aspect around {@link Rule#preAction(SimulationContext, Date, Metier)} in packages "rules". + * + * @param jp join point + * @return preAction result + * @throws Throwable + */ + @Around("execution(* rules.*.preAction(..))") + public Object initPreCall(final JoinPoint jp) throws Throwable { + + Object result = makeTimedCall(jp, State.PRE); + return result; + } + + /** + * Aspect around {@link Rule#postAction(SimulationContext, Date, Metier)} in packages "rules". + * + * @param jp join point + * @return preAction result + * @throws Throwable + */ + @Around("execution(* rules.*.postAction(..))") + public Object initPostCall(final JoinPoint jp) throws Throwable { + + Object result = makeTimedCall(jp, State.POST); + return result; + } + + /** + * Effectue l'appel reel en calculant le temps pris. + * + * @param jp join point + * @param state + * @param aspectized class return object + * @throws Throwable + */ + protected Object makeTimedCall(JoinPoint jp, State state) throws Throwable { + + if (log.isTraceEnabled()) { + log.trace("Rule aspect called : " + jp.getCalleeClass().getSimpleName()); + } + + // get time before + long timeBeforeCall = System.currentTimeMillis(); + + // make real call + Object result = jp.proceed(); + + // get time after + long timeAfterCall = System.currentTimeMillis(); + + // get real time + long timeTaken = timeAfterCall - timeBeforeCall; + + registerTime(jp, state, timeTaken); + + return result; + + } + + /** + * Add time (init/pre/post) to simulation information in + * current {@link SimulationContext}. + * + * @param jp join point + * @param state state + * @param timeTaken time taken by {@code state} + */ + protected void registerTime(JoinPoint jp, State state, long timeTaken) { + SimulationContext context = SimulationContext.get(); + + SimulationStorage simulation = context.getSimulationStorage(); + + // happen if called outside a simulation + // so ... can't happen :) + if (simulation != null) { + + // get rule information + Class<?> calleeClass = jp.getCalleeClass(); + String ruleName = calleeClass.getSimpleName(); + + SimulationInformation info = simulation.getInformation(); + + switch (state) { + case INIT: + info.addRuleInitTime(ruleName, timeTaken); + break; + case PRE: + info.addRulePreTime(ruleName, timeTaken); + break; + case POST: + info.addRulePostTime(ruleName, timeTaken); + break; + default: + break; + } + } + else { + if (log.isWarnEnabled()) { + log.warn("Time register called outside a simulation context"); + } + } + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-11 09:27:25 UTC (rev 2597) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-11 09:27:55 UTC (rev 2598) @@ -127,25 +127,35 @@ if (ruleNames.size() > 0) { result += "Rule time:\n"; for (String ruleName : ruleNames) { + + String details = ""; + long total = 0; + long time = getRuleInitTime(ruleName); - long total = time; if (time > 0) { - - String details = ""; + total += time; details += "init:" + DurationFormatUtils.formatDuration(time, "s'.'S"); - - // can be 0 if condition always return false, never entrer pre/post - time = getRulePreTime(ruleName); - if (time > 0) { - total += time; - details += ", pre:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + } + + // can be 0 if condition always return false, never entrer pre/post + time = getRulePreTime(ruleName); + if (time > 0) { + if (total > 0) { + details += ", "; } - time = getRulePostTime(ruleName); - if (time > 0) { - total += time; - details += ", post:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + total += time; + details += "pre:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + } + time = getRulePostTime(ruleName); + if (time > 0) { + if (total > 0) { + details += ", "; } + total += time; + details += "post:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + } + if (total > 0) { result += "\t" + ruleName + " : " + DurationFormatUtils.formatDuration(total, "s'.'S"); result += " (" + details + ")"; result += "\n"; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java 2009-09-11 09:27:25 UTC (rev 2597) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java 2009-09-11 09:27:55 UTC (rev 2598) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,9 +17,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * Simulator.java - * +package fr.ifremer.isisfish.simulator; + +/** + * This interface is used when simulator have all code for simulation. + * * Created: 5 juil. 2006 17:57:46 * * @author poussin @@ -28,17 +30,13 @@ * Last update: $Date$ * by : $Author$ */ - -package fr.ifremer.isisfish.simulator; - - -/** - * This interface is used when simulator have all code for simulation. - * - * @author poussin - */ public interface Simulator { + + /** + * Run simulation. + * + * @param context simulation context to use + * @throws Exception + */ public void simulate(SimulationContext context) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-11 09:27:25 UTC (rev 2597) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-11 09:27:55 UTC (rev 2598) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.aspect.AspectClassLoader; import fr.ifremer.isisfish.aspect.Cache; +import fr.ifremer.isisfish.aspect.RuleAspect; import fr.ifremer.isisfish.aspect.Trace; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; @@ -332,6 +333,9 @@ context.setSimulationControl(control != null ? control : new SimulationControl(simulation.getName())); + // Warning : Rule have to be instanciated after aspect definition + classLoader.deploy(RuleAspect.class); + SimulationParameter parameters = simulation.getParameter(); parameters.setIsisFishVersion(IsisConfig.getVersion()); // forceReload, save all modification in parameter and reread it @@ -348,6 +352,7 @@ message(control, _("isisfish.message.setting.cache.aspects")); classLoader.deploy(Cache.class); } + // recherche du simulateur a utiliser String simulatorName = parameters.getSimulatorName(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-09-11 09:27:25 UTC (rev 2597) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-09-11 09:27:55 UTC (rev 2598) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License

1 0

r2597 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 11 Sep '09

11 Sep '09

Author: chatellier Date: 2009-09-11 09:27:25 +0000 (Fri, 11 Sep 2009) New Revision: 2597 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Load rule 'on demand' (not on simulation parameter reloading) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-11 09:25:27 UTC (rev 2596) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-11 09:27:25 UTC (rev 2597) @@ -1,4 +1,5 @@ -/* *##% Copyright (C) 2006 - 2009 Code Lutin, Cédric Pineau, Benjamin Poussin +/* *##% + * Copyright (C) 2006 - 2009 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software @@ -64,7 +65,7 @@ import fr.ifremer.isisfish.util.ConverterUtil; /** - * Contains all parameter for one simulation. + * Contains all parameters for one simulation. * * Created: 10 janv. 2006 17:03:37 * @@ -87,7 +88,7 @@ * @deprecated remove this hack */ public static String NUMBER_OF_SENSITIVITY_SIMULATION = "numberOfSensitivitySimulation"; - + /** * Isis-fish version that permit to do the simulation, must be set just * before simulation by simulator. @@ -359,8 +360,8 @@ // when reading new properties files, clean some information // to force re instantion on next call - // @see { sensitivityExports = null; + rules = null; isisFishVersion = props.getProperty("isisFishVersion", ""); description = props.getProperty("description", ""); @@ -446,23 +447,6 @@ log.warn("Can't get PopulationDAO", eee1); } } - - // rules - String[] ruleList = props.getProperty("rules", "").split(","); - int ruleIndex = 0; - for (String name : ruleList) { - if (name != null && !"".equals(name)) { - try { - Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); - RuleHelper.populateRule(ruleIndex++, tx, rule, props); - getRules().add(rule); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find rule: " + name, eee); - } - } - } - } tx.commitTransaction(); @@ -579,7 +563,7 @@ if (log.isDebugEnabled()) { log.debug("Reloading rules"); } - for (Rule rule : rules) { + for (Rule rule : getRules()) { try { for (Field field : rule.getClass().getFields()) { // le champ ne doit pas être privé @@ -915,13 +899,62 @@ } /** + * Get parameters rule list. * @return Returns the rules. */ public List<Rule> getRules() { - if (rules == null) { + if (rules == null || rules.isEmpty()) { rules = new ArrayList<Rule>(); + + if (lastReadParameters != null) { + try { + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + // rules + String[] ruleList = lastReadParameters.getProperty("rules", "").split(","); + int ruleIndex = 0; + for (String name : ruleList) { + if (name != null && !"".equals(name)) { + try { + Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); + RuleHelper.populateRule(ruleIndex++, tx, rule, lastReadParameters); + rules.add(rule); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find rule: " + name, eee); + } + } + } + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee1) { + if (log.isWarnEnabled()) { + log.warn("Can't get TopiaContext", eee1); + } + } + } + else { + if (log.isDebugEnabled()) { + log.debug("No last read properties, skip rule reloading"); + } + } } - return this.rules; + return rules; } /**

1 0

r2596 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 11 Sep '09

11 Sep '09

Author: chatellier Date: 2009-09-11 09:25:27 +0000 (Fri, 11 Sep 2009) New Revision: 2596 Modified: isis-fish/trunk/pom.xml Log: Update h2 (again...) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-09-10 09:05:38 UTC (rev 2595) +++ isis-fish/trunk/pom.xml 2009-09-11 09:25:27 UTC (rev 2596) @@ -221,7 +221,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.117</version> + <version>1.1.118</version> <scope>compile</scope> </dependency>

1 0

r2595 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 10 Sep '09

10 Sep '09

Author: chatellier Date: 2009-09-10 09:05:38 +0000 (Thu, 10 Sep 2009) New Revision: 2595 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java Log: Don't make call twice Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-09-10 07:47:36 UTC (rev 2594) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-09-10 09:05:38 UTC (rev 2595) @@ -31,6 +31,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportHelper; +import fr.ifremer.isisfish.export.SensitivityExport; /** * Export simulation listener. @@ -81,8 +82,9 @@ // second, add already instanciated sensitivity // exports (with parameters) - if (parameters.getSensitivityExport() != null) { - allExports.addAll(parameters.getSensitivityExport()); + List<SensitivityExport> sensitivityExports = parameters.getSensitivityExport(); + if (sensitivityExports != null) { + allExports.addAll(sensitivityExports); } // make exports

1 0