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

r3984 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bpoussin＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: bpoussin Date: 2014-05-16 19:10:22 +0200 (Fri, 16 May 2014) New Revision: 3984 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3984 Log: reset error counter to 0, when pause executor Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-15 16:08:30 UTC (rev 3983) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-16 17:10:22 UTC (rev 3984) @@ -675,6 +675,8 @@ launcher, i.intValue())); SimulationExecutor e = executors.get(launcher); e.pause(); + // reset error to 0 + i.setValue(0); } // il faut bien penser a supprimer le launcher pour qu'un autre executor // puisse y mettre le sien.

1 0

r3983 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com May 15, 2014

May 15, 2014

Author: echatellier Date: 2014-05-15 18:08:30 +0200 (Thu, 15 May 2014) New Revision: 3983 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3983 Log: refs #2255: Readd full classloader modification for aspectj Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-15 15:31:29 UTC (rev 3982) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-15 16:08:30 UTC (rev 3983) @@ -34,6 +34,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import org.apache.commons.io.FileUtils; @@ -70,6 +71,7 @@ import fr.ifremer.isisfish.simulator.Simulator; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.util.CompileHelper; /** * Fait une simulation dans la meme jvm. @@ -278,6 +280,9 @@ * @return le classe loader modifié */ protected AspectJUrlClassLoader changeClassLoader(Thread thread, File directory) { + /* + FIXME echatellier 20140419 : normalement c'est ce code original qui est bon + il fonctionne sur eclipse, mais pas en java -jar ... try { URL[] classpath = new URL[] { directory.toURI().toURL(), // poussin 20080821 : il semble ne plus trouve les formules, @@ -294,6 +299,37 @@ // impossible car on creer l'url a partir d'un File ce qui ne pose // noralement pas de probleme throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); + }*/ + + // FIXME echatellier 20140419 : pour que aspectj fonctionne, on lui construit un urlclassloader + // complet avec toutes les urls + try { + List<URL> urls = new ArrayList<>(); + for (Enumeration<?> e = CompileHelper.class.getClassLoader() + .getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { + URL url = (URL) e.nextElement(); + if (log.isDebugEnabled()) { + log.debug("Found manifest : " + url); + } + if ((url != null) && url.getFile().startsWith("file:/")) { + String jarPath = url.getPath().substring(0, + url.getPath().indexOf("!")); + urls.add(new URL(jarPath)); + } + } + urls.add(directory.toURI().toURL()); + urls.add(IsisFish.config.getCompileDirectory().toURI().toURL()); + AspectJUrlClassLoader loader = new AspectJUrlClassLoader(urls.toArray(new URL[urls.size()]), + IsisFish.class.getClassLoader()); + thread.setContextClassLoader(loader); + log.error("Classloader used for simulation: " + loader + " " + + Arrays.toString(loader.getURLs())); + return loader; + } catch (Exception eee) { + // on leve un runtime, car normalement cette erreur est pratiquement + // impossible car on creer l'url a partir d'un File ce qui ne pose + // noralement pas de probleme + throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); } }

1 0

r3982 - in trunk/src/main/java/fr/ifremer/isisfish: aspect simulator/launcher
by echatellier＠users.forge.codelutin.com May 15, 2014

May 15, 2014

Author: echatellier Date: 2014-05-15 17:31:29 +0200 (Thu, 15 May 2014) New Revision: 3982 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3982 Log: refs #2255: Move enum out of class for aspectization Added: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-05-15 10:09:19 UTC (rev 3981) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-05-15 15:31:29 UTC (rev 3982) @@ -54,13 +54,6 @@ @Aspect public class RuleAspect { - /** - * State phase to register. - */ - protected static enum State { - INIT, PRE, POST - } - /** Log. */ private static Log log = LogFactory.getLog(RuleAspect.class); Added: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java 2014-05-15 15:31:29 UTC (rev 3982) @@ -0,0 +1,36 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, Chatellier Eric + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.aspect; + +/** + * State phase to register. + * + * Avant, cette enum était dans RuleAspect. Mais depuis le passage à aspectj, il y a une erreur + * étrange d'accès: + * java.lang.IllegalAccessError: tried to access class fr.ifremer.isisfish.aspect.RuleAspect$1 from class fr.ifremer.isisfish.aspect.RuleAspect + */ +public enum State { + INIT, PRE, POST +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-15 10:09:19 UTC (rev 3981) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-15 15:31:29 UTC (rev 3982) @@ -34,7 +34,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Enumeration; import java.util.List; import org.apache.commons.io.FileUtils; @@ -71,7 +70,6 @@ import fr.ifremer.isisfish.simulator.Simulator; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.CompileHelper; /** * Fait une simulation dans la meme jvm. @@ -280,9 +278,6 @@ * @return le classe loader modifié */ protected AspectJUrlClassLoader changeClassLoader(Thread thread, File directory) { - /* - FIXME echatellier 20140419 : normalement c'est ce code original qui est bon - il fonctionne sur eclipse, mais pas en java -jar ... try { URL[] classpath = new URL[] { directory.toURI().toURL(), // poussin 20080821 : il semble ne plus trouve les formules, @@ -299,37 +294,6 @@ // impossible car on creer l'url a partir d'un File ce qui ne pose // noralement pas de probleme throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); - }*/ - - // FIXME echatellier 20140419 : pour que aspectj fonctionne, on lui construit un urlclassloader - // complet avec toutes les urls - try { - List<URL> urls = new ArrayList<>(); - for (Enumeration<?> e = CompileHelper.class.getClassLoader() - .getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { - URL url = (URL) e.nextElement(); - if (log.isDebugEnabled()) { - log.debug("Found manifest : " + url); - } - if ((url != null) && url.getFile().startsWith("file:/")) { - String jarPath = url.getPath().substring(0, - url.getPath().indexOf("!")); - urls.add(new URL(jarPath)); - } - } - urls.add(directory.toURI().toURL()); - urls.add(IsisFish.config.getCompileDirectory().toURI().toURL()); - AspectJUrlClassLoader loader = new AspectJUrlClassLoader(urls.toArray(new URL[urls.size()]), - IsisFish.class.getClassLoader()); - thread.setContextClassLoader(loader); - log.error("Classloader used for simulation: " + loader + " " - + Arrays.toString(loader.getURLs())); - return loader; - } catch (Exception eee) { - // on leve un runtime, car normalement cette erreur est pratiquement - // impossible car on creer l'url a partir d'un File ce qui ne pose - // noralement pas de probleme - throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); } }

1 0

r3981 - in trunk/src/main: java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/ui/queue resources/i18n
by bpoussin＠users.forge.codelutin.com May 15, 2014

May 15, 2014

Author: bpoussin Date: 2014-05-15 12:09:19 +0200 (Thu, 15 May 2014) New Revision: 3981 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3981 Log: - Ajout d'un delai avant resoumission d'un job qui n'a pas pu etre execute (ex: probleme de connexion reseau) - ajout d'un message sur le job lorsqu'il est en pause - Remise en marche du bouton Pause/Reprendre de la queue de simulation - changement de traduction pour le bouton Added: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-05-15 10:09:19 UTC (rev 3981) @@ -27,11 +27,14 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; + import static org.nuiton.i18n.I18n.t; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,6 +66,9 @@ this); /** vrai si cet executor est en pause */ protected boolean pause = false; + private ReentrantLock pauseLock = new ReentrantLock(); + private Condition unpaused = pauseLock.newCondition(); + /** le nombre de thread utilise avant la pause */ protected int lastCorePoolSize; /** le simulation service qui a cree cet executor */ @@ -121,24 +127,39 @@ protected void beforeExecute(Thread t, Runnable r) { super.beforeExecute(t, r); - // en premier lieu il faut que SimulationService autorise le lancement - getSimulationService().waitAutoLaunch(); + if (r instanceof SimulationJob) { + SimulationJob job = (SimulationJob) r; - // ensuite si cet executor est en pause, on tu le thread apres avoir - // resoumis la simulation - if (isPause()) { - // on est en pause, il faut remettre la tache et tuer le thread - // un simple suspend du thread n'est pas bon, car la tache ne - // serait alors jamais executer et ce n'est pas forcement ce que - // l'on souhaite - if (r instanceof SimulationJob) { - SimulationService.getService().resubmit((SimulationJob) r); + // en premier lieu il faut que SimulationService autorise le lancement + getSimulationService().waitAutoLaunch(job); + + // wait if this executor is in pause status + pauseLock.lock(); + try { + while (isPause()) { + job.getItem().getControl().setText(t("Pause")); + unpaused.await(); + } + } catch (InterruptedException ie) { + t.interrupt(); + } finally { + pauseLock.unlock(); } - throw new RuntimeException( - t("Normal stop thread, this is not an error")); - } - if (r instanceof SimulationJob) { - SimulationJob job = (SimulationJob) r; + +// // ensuite si cet executor est en pause, on tu le thread apres avoir +// // resoumis la simulation +// if (isPause()) { +// // on est en pause, il faut remettre la tache et tuer le thread +// // un simple suspend du thread n'est pas bon, car la tache ne +// // serait alors jamais executer et ce n'est pas forcement ce que +// // l'on souhaite +// if (r instanceof SimulationJob) { +// SimulationService.getService().resubmit((SimulationJob) r); +// } +// throw new RuntimeException( +// t("Normal stop thread, this is not an error")); +// } + if (job.getLauncher() == null) { // si la tache a deja un launcher, on l'utilise sinon on lui // indique d'utilise le notre. C'est seul facon propre et sans @@ -186,19 +207,36 @@ * @param pause pause value to set */ public void setPause(boolean pause) { - boolean oldValue = this.pause; - synchronized (this) { + pauseLock.lock(); + try { + + if (this.pause == pause) { + // same state, do nothing + return; + } + boolean oldValue = this.pause; this.pause = pause; - if (this.pause) { - lastCorePoolSize = getCorePoolSize(); - setCorePoolSize(0); - } else { - setCorePoolSize(lastCorePoolSize); - // on recree tous les threads qui avait ete tue par la pause - prestartAllCoreThreads(); + if (!this.pause) { + unpaused.signalAll(); } + propertyListeners.firePropertyChange("pause", oldValue, pause); + } finally { + pauseLock.unlock(); } - propertyListeners.firePropertyChange("pause", oldValue, this.pause); + +// boolean oldValue = this.pause; +// synchronized (this) { +// this.pause = pause; +// if (this.pause) { +// lastCorePoolSize = getCorePoolSize(); +// setCorePoolSize(0); +// } else { +// setCorePoolSize(lastCorePoolSize); +// // on recree tous les threads qui avait ete tue par la pause +// prestartAllCoreThreads(); +// } +// } +// propertyListeners.firePropertyChange("pause", oldValue, this.pause); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-15 10:09:19 UTC (rev 3981) @@ -346,12 +346,15 @@ /** * Permet de mettre en attente les threads de simulation si l'utilisateur * a suspendu la queue + * + * @param job le job pour lequel on vu savoir s'il faut l'executer ou non */ - protected void waitAutoLaunch() { + protected void waitAutoLaunch(SimulationJob job) { synchronized (this) { while (!isAutoLaunch()) { try { log.info("autoLaunch is false waiting queue start"); + job.getItem().getControl().setText(t("Pause")); this.wait(); } catch (InterruptedException eee) { log.warn("Error during wait autoLaunch flag", eee); @@ -655,6 +658,8 @@ } /** + * This method must be call in thread simulation + * * Report une erreur pour un launcher, on resoumet le job en supprimant * le launcher utilise * @@ -676,6 +681,12 @@ // FIXME: est ce le bon choix si l'utilisateur avait force un launcher particulier, ne faudrait t'il pas prevenir l'utilisateur ? // FIXME: disabled since caparmor is not our friend. Retry on caparmor in the limit of 50 errors //job.setLauncher(null); + try { + // not resubmit immediatly, wait some time (max 10 min and about 4,2 hours in total) + Thread.sleep(i.intValue() / 5 * 60 * 1000); + } catch (InterruptedException eee) { + log.info("Can't sleep before resubmit job, never mind", eee); + } resubmit(job); } Added: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java 2014-05-15 10:09:19 UTC (rev 3981) @@ -0,0 +1,71 @@ +package fr.ifremer.isisfish.ui.queue; + + +import fr.ifremer.isisfish.simulator.launcher.SimulationExecutor; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import javax.swing.JToggleButton.ToggleButtonModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class PauseButtonModel extends ToggleButtonModel implements PropertyChangeListener, ItemListener { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(PauseButtonModel.class); + private static final long serialVersionUID = 1L; + + protected SimulationService service; + final static private String servicePropertyName = "autoLaunch"; + final static private String executorPropertyName = "pause"; + + public PauseButtonModel(SimulationService service) { + this.service = service; + + boolean b = service.isAutoLaunch(); + service.addPropertyChangeListener(servicePropertyName, this); + + for (SimulationExecutor e : service.getSimulationExecutors()) { + b = b && !e.isPause(); + e.addPropertyChangeListener(executorPropertyName, this); + } + + setSelected(b); + + addItemListener(this); + } + + // event from service or executor, change button + @Override + public void propertyChange(PropertyChangeEvent event) { + boolean b = (Boolean)event.getNewValue(); + setSelected(b); + } + + // event from button, change model + @Override + public void itemStateChanged(ItemEvent event) { + boolean b = event.getStateChange() == ItemEvent.SELECTED; + service.setAutoLaunch(b); + // if pause asked, (b == false) only service can be put in autoLaunch = false + // executor see this autoLaunch value. + // if resume asked (b == true), we must ensure that all executer are resume too + if (b) { + for (SimulationExecutor e : service.getSimulationExecutors()) { + e.resume(); + } + } + } + + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2014-05-15 10:09:19 UTC (rev 3981) @@ -46,6 +46,7 @@ <SimulationServiceTableModel id="newSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), true)'/> <SimulationServiceTableModel id="doneSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), false)' onTableChanged='queueAction.updateActions()' /> + <PauseButtonModel id="autoLaunchButtonModel" javaBean='new PauseButtonModel(SimulationService.getService())'/> <DefaultListSelectionModel id="selectionModelQueueTable" onValueChanged='queueAction.updateActions()'/> <DefaultListSelectionModel id="selectionModelQueueTableDone" onValueChanged='queueAction.updateActions()'/> @@ -68,7 +69,7 @@ </row> <row> <cell fill="horizontal" weightx="0.3"> - <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/> + <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch" model="{autoLaunchButtonModel}"/> </cell> <cell fill="horizontal" weightx="0.3"> <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='queueAction.stopSimulation()' enabled='{isCanStop()}' /> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-05-15 10:09:19 UTC (rev 3981) @@ -45,6 +45,7 @@ No\ port\ cell= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= +Pause= Process\ template\ error= QUnif\ %= QUnif\ Min/Max= @@ -811,7 +812,7 @@ isisfish.queue.progression=Progress isisfish.queue.restartSimulation=Restart isisfish.queue.showLog=Show simulation log -isisfish.queue.simulationLaunch=Simulation queue launch +isisfish.queue.simulationLaunch=Pause / Resume isisfish.queue.status=Status isisfish.queue.stopSimulation=Stop simulation isisfish.queue.title=Queue Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-05-15 10:09:19 UTC (rev 3981) @@ -45,6 +45,7 @@ No\ port\ cell= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= +Pause= Process\ template\ error= QUnif\ %= QUnif\ Min/Max= @@ -806,7 +807,7 @@ isisfish.queue.progression=Progression isisfish.queue.restartSimulation=Redémarrer isisfish.queue.showLog=Voir les logs de la simulation -isisfish.queue.simulationLaunch=Lanceur de la queue des simulations +isisfish.queue.simulationLaunch=Pause / Reprendre isisfish.queue.status=État isisfish.queue.stopSimulation=Arrêter la simulation isisfish.queue.title=Queue

1 0

r3980 - trunk
by echatellier＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: echatellier Date: 2014-05-12 10:16:17 +0200 (Mon, 12 May 2014) New Revision: 3980 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3980 Log: Use i18n and topia stable release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-29 08:23:58 UTC (rev 3979) +++ trunk/pom.xml 2014-05-12 08:16:17 UTC (rev 3980) @@ -470,9 +470,9 @@  <jaxxVersion>2.8.4</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> - <topiaVersion>2.9-SNAPSHOT</topiaVersion> + <topiaVersion>2.9-rc-1</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> - <nuitonI18nVersion>3.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles>

1 0

r3979 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 29, 2014

April 29, 2014

Author: echatellier Date: 2014-04-29 10:23:58 +0200 (Tue, 29 Apr 2014) New Revision: 3979 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3979 Log: Fix getUseCache parameter Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-04-28 13:51:19 UTC (rev 3978) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-04-29 08:23:58 UTC (rev 3979) @@ -509,7 +509,7 @@ String trace = context.getTrace().printStatisticAndClear(); simulation.getInformation().setStatistic(trace); } - if (param.getUseOptimization()) { + if (param.getUseCache()) { String cache = context.getCache().printStatistiqueAndClear(); simulation.getInformation().setOptimizationUsage(cache); }

1 0

r3978 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 28, 2014

April 28, 2014

Author: echatellier Date: 2014-04-28 15:51:19 +0200 (Mon, 28 Apr 2014) New Revision: 3978 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3978 Log: Add fixme Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-28 13:35:20 UTC (rev 3977) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-28 13:51:19 UTC (rev 3978) @@ -134,6 +134,7 @@ Thread.sleep(2000); } + // FIXME echatellier 20140418 exception is always false, it's value never changes if (!exception && !control.isStopSimulationRequest()) { optimization.endSimulation(optimizationContext); // close current generation simulations

1 0

r3977 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 28, 2014

April 28, 2014

Author: echatellier Date: 2014-04-28 15:35:20 +0200 (Mon, 28 Apr 2014) New Revision: 3977 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3977 Log: Copie des fonctions d'objectif de d'optimisation dans le zip de preparation (n?\195?\169c?\195?\169ssaire pour les necessaryResults) Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-28 09:30:23 UTC (rev 3976) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-28 13:35:20 UTC (rev 3977) @@ -66,6 +66,8 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.ExportStorage; +import fr.ifremer.isisfish.datastore.ObjectiveStorage; +import fr.ifremer.isisfish.datastore.OptimizationStorage; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; @@ -78,6 +80,8 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.Objective; +import fr.ifremer.isisfish.simulator.Optimization; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationException; import fr.ifremer.isisfish.simulator.SimulationParameter; @@ -677,12 +681,13 @@ /** * Prepare les fichiers qui seront utilsé à la simulation: - * Prepare les fichiers qui seront utilsé à la simulation: * <ul> * <li> scripts</li> * <li> rules</li> * <li> exports</li> * <li> simulators</li> + * <li> optimisations</li> + * <li> objectives</li> * <li> export de la database de la region</li> * <li> simultionplan</li> * </ul> @@ -807,6 +812,30 @@ + File.separator + name)); } + // copie de la fonction d'objectif + Objective objective = param.getObjective(); + if (objective != null) { + String name = ObjectiveStorage.getName(objective); + File objectiveFile = new File(ObjectiveStorage.getObjectiveDirectory(), name + ".java"); + if (!objectiveFile.isFile()) { + objectiveFile = new File(ObjectiveStorage.getCommunityObjectiveDirectory(), name + ".java"); + } + FileUtils.copyFile(objectiveFile, new File(tmpDirectory, ObjectiveStorage.OBJECTIVE_PATH + + File.separator + name + ".java")); + } + + // copie du script d'optipmisation + Optimization optimization = param.getOptimization(); + if (optimization != null) { + String name = OptimizationStorage.getName(optimization); + File optimizationFile = new File(OptimizationStorage.getOptimizationDirectory(), name + ".java"); + if (!optimizationFile.isFile()) { + optimizationFile = new File(OptimizationStorage.getCommunityOptimizationDirectory(), name + ".java"); + } + FileUtils.copyFile(optimizationFile, new File(tmpDirectory, OptimizationStorage.OPTIMIZATION_PATH + + File.separator + name + ".java")); + } + // copie des export d'optimisation for (Export export : param.getOptimizationExportsObservations().keySet()) { String name = ExportStorage.getName(export);

1 0

r3976 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com April 28, 2014

April 28, 2014

Author: echatellier Date: 2014-04-28 11:30:23 +0200 (Mon, 28 Apr 2014) New Revision: 3976 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3976 Log: Change configuration key to follow isis fish changes Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-04-28 08:58:10 UTC (rev 3975) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-04-28 09:30:23 UTC (rev 3976) @@ -1003,7 +1003,7 @@ /** Serveur accessible par ssh : remote tmp path */ SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), /** Serveur accessible par SSH : emplacement de Java (full path) */ - SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath64", n("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk7/bin/java"), + SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath430", n("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk7/bin/java"), /** Serveur accessible par SSH : emplacement des executables pbs */ SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */

1 0

r3975 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 28, 2014

April 28, 2014

Author: echatellier Date: 2014-04-28 10:58:10 +0200 (Mon, 28 Apr 2014) New Revision: 3975 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3975 Log: Start optimisation simulation immediatelly Close simulation after end method call Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-24 08:11:01 UTC (rev 3974) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-28 08:58:10 UTC (rev 3975) @@ -110,7 +110,9 @@ int childNumber = childParam.getSimulationPlanNumber(); SimulationControl childControl = new SimulationControl(simId); SimulationItem item = new SimulationItem(childControl, childParam); - item.setStandaloneSimulation(false); + // FIXME set to true for now, but must be changed to run + // simulation optimisation by generation (not one by one) + item.setStandaloneSimulation(true); item.setSimulationNumber(childNumber); item.setSimulationZip(zip); @@ -134,6 +136,11 @@ if (!exception && !control.isStopSimulationRequest()) { optimization.endSimulation(optimizationContext); + // close current generation simulations + for (SimulationStorage sim : sims) { + sim.closeStorage(); + sim.closeMemStorage(); + } optimization.nextSimulation(optimizationContext); sims = optimizationContext.clearNextSimulation(); }

1 0