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

r2276 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 26 May '09

26 May '09

Author: chatellier Date: 2009-05-26 08:16:31 +0000 (Tue, 26 May 2009) New Revision: 2276 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Ajout d'un log info (pour qu'on sache que isis fasse quelque chose) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 16:07:08 UTC (rev 2275) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-26 08:16:31 UTC (rev 2276) @@ -375,6 +375,10 @@ SimulationJob job = firstEntry.getValue(); SimulatorLauncher launcher = job.getLauncher(); + if (log.isInfoEnabled()) { + log.info("Check simulation progression : " + job.getId()); + } + // retourne true if : // - simulation is finished // - simulation end has been asked

1 0

r2275 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore simulator
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 16:07:08 +0000 (Mon, 25 May 2009) New Revision: 2275 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Update javadoc about region root directory hack Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-25 16:02:49 UTC (rev 2274) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-25 16:07:08 UTC (rev 2275) @@ -321,10 +321,12 @@ * Get parameter property. * * This method open database. - * + * + * @param directory if not null, region will be forced to this directory + * * @return Parameter property. */ - public SimulationParameter getParameter(File dir) { + public SimulationParameter getParameter(File directory) { if (parameter == null) { Properties prop = new Properties(); File file = getSimulationParametersFile(); @@ -340,7 +342,7 @@ prop.load(in); in.close(); parameter = new SimulationParameter(); - parameter.fromProperties(dir, prop); + parameter.fromProperties(directory, prop); } catch (IOException eee) { throw new IsisFishRuntimeException(_( "isisfish.error.read.simulation.parameters", file), eee); 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-05-25 16:02:49 UTC (rev 2274) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-05-25 16:07:08 UTC (rev 2275) @@ -231,7 +231,7 @@ * Cela permet de le stocker facilement sur le disque. * * @return L'objet Properties representant les parametres - * @see #fromProperties(File,Properties) + * @see #fromProperties(File, Properties) */ public Properties toProperties() { Properties result = new Properties(); @@ -338,6 +338,12 @@ return result; } + /** + * Load properties from file. + * + * @param directory if not null, region will be forced to this directory + * @param props property to read + */ public void fromProperties(File directory, Properties props) { isisFishVersion = props.getProperty("isisFishVersion", ""); description = props.getProperty("description", ""); @@ -350,7 +356,7 @@ "useStatistic", "true")); // FIXME not good place and code - if(directory != null && (this.region == null || !region.getName().equals(regionName))) { + if (directory != null && (this.region == null || !region.getName().equals(regionName))) { // ATTENTION: directory pointe sur le repertoire de la simulation et non de la region this.region = new RegionStorage(directory, regionName); // RegionStorage.getRegion(directory, regionName); }

1 0

r2274 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 16:02:49 +0000 (Mon, 25 May 2009) New Revision: 2274 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Reutilisation (encore :() du hack pour charger les r?\195?\169gion au bon endroit 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-05-25 16:01:59 UTC (rev 2273) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-25 16:02:49 UTC (rev 2274) @@ -108,7 +108,9 @@ .importAndRenameZip(simulationZip, id); // add missing control informations - SimulationParameter param = simulation.getParameter(); + // TODO again region database directory hack + // force region reading in simulation directory + SimulationParameter param = simulation.getParameter(simulation.getFile()); control.setDate(new Date()); control.setProgress(0); control.setStarted(true);

1 0

r2273 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 16:01:59 +0000 (Mon, 25 May 2009) New Revision: 2273 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Remove unused import Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-05-25 16:01:22 UTC (rev 2272) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-05-25 16:01:59 UTC (rev 2273) @@ -25,23 +25,16 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.List; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; -import javax.tools.JavaFileObject.Kind; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log;

1 0

r2272 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 16:01:22 +0000 (Mon, 25 May 2009) New Revision: 2272 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Desactive le monitoring pour les lancements sans UI (pas problematique, mais inutile) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-05-25 16:00:38 UTC (rev 2271) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-05-25 16:01:22 UTC (rev 2272) @@ -189,7 +189,10 @@ // fait un appel au moniteur // pour reprendre le monitoring des simulation en cours - SimulationMonitor.getInstance().reloadConfig(this); + // TODO check this, don't restart monitoring on non ui launch + if (IsisFish.config.isLaunchUI()) { + SimulationMonitor.getInstance().reloadConfig(this); + } } /**

1 0

r2271 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 16:00:38 +0000 (Mon, 25 May 2009) New Revision: 2271 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Log: Missing space in log Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-25 16:00:03 UTC (rev 2270) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-25 16:00:38 UTC (rev 2271) @@ -277,7 +277,7 @@ } else { if (log.isDebugEnabled()) { log.debug("Control file '" + controlFile.getAbsolutePath() - + "'doesn't exists"); + + "' doesn't exists"); } } } catch (Exception e) {

1 0

r2270 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 16:00:03 +0000 (Mon, 25 May 2009) New Revision: 2270 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Si isis se lance sans UI, on dit qu'on a un CVS de type none (plus de demande de passphrase, etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-05-25 13:24:45 UTC (rev 2269) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-05-25 16:00:03 UTC (rev 2270) @@ -72,6 +72,7 @@ import fr.ifremer.isisfish.vcs.VCSActionEvent; import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; +import fr.ifremer.isisfish.vcs.VCSNone; import fr.ifremer.isisfish.vcs.VetoableActionListener; /** @@ -310,12 +311,12 @@ * @throws VCSException */ static public void initVCS() throws VCSException { - - // init vcs - // even if UI in not launched - vcs = VCSFactory.createVCS(config); - + if (config.isLaunchUI()) { + // init vcs + // even if UI in not launched + vcs = VCSFactory.createVCS(config); + // FIXME ajouter une option vcs.init VCSActionAsker asker = new VCSActionAsker(); @@ -438,6 +439,12 @@ // fin de l'init on supprime le vetoable du vcs vcs.remoteVetoableActionListener(asker); } + else { + // VCS can't be null + // set none if ui isn't launched + config.setOption(VCS.VCS_TYPE, "none"); // to make him happy + vcs = VCSFactory.createVCS(config); + } } /**

1 0

r2269 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 13:24:45 +0000 (Mon, 25 May 2009) New Revision: 2269 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Parcours la liste des simulations en 2 temps (dossier/storage), c'est lent seulement pour la derniere boucle Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 13:23:59 UTC (rev 2268) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 13:24:45 UTC (rev 2269) @@ -30,6 +30,7 @@ import java.util.Date; import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Properties; import java.util.SortedSet; @@ -638,48 +639,15 @@ // this is a sensitivity simulation String simulationId = job.getId(); String simulationCommonPrefix = simulationId.substring(0, simulationId.lastIndexOf("_")); - - // simulation start at 0 - LinkedList<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); - // en sens inverse, il le fera carrement moins souvent - for (int simulationIndex = numberOfSimulation - 1; simulationIndex >= 0 ; --simulationIndex) { - String currentId = simulationCommonPrefix + "_" + simulationIndex; - if (SimulationStorage.localyExists(currentId)) { - SimulationControl currentSimulationControl = new SimulationControl(currentId); - SimulationStorage.readControl(currentId, currentSimulationControl); - - // condition for simulation "end" - if (currentSimulationControl.getProgress() > 0 - && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { - SimulationStorage storage = SimulationStorage.getSimulation(currentId); - // always add first (loop in reverse order) - // result list is keeped sorted - simulationStorageForAnalyze.addFirst(storage); - if (log.isDebugEnabled()) { - log.debug("Found simulation number = " + simulationIndex); - } - } - else { - if (log.isDebugEnabled()) { - log.debug("Miss simulation number = " + simulationIndex); - } - - // no need to continue - // if only miss one, break - break; - } - } - else { - break; - } - } + int numberFinished = getNumberOfFinishedSimulation(simulationCommonPrefix, numberOfSimulation); // si on a toutes les simulation est qu'elles sont finie // on construit la liste des simulation storage // et on l'envoie au script d'analyse de sensibilite - if (simulationStorageForAnalyze.size() == numberOfSimulation) { + if (numberFinished == numberOfSimulation) { + // FIXME buggy because of hack in getParameter() - // getRegion() from simulation can be lockek + // getRegion() from simulation can be locked SimulationParameter params = simulation.getParameter(); SensitivityCalculator sensitivityCalculator = params.getSensitivityCalculator(); if (sensitivityCalculator != null) { @@ -687,6 +655,9 @@ log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); } try { + // get full storage list + List<SimulationStorage> simulationStorageForAnalyze = + getStorageListForSecondPass(simulationCommonPrefix, numberOfSimulation); // build master sensitivity export directory File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); // directory must already exists !!! @@ -703,6 +674,76 @@ } /** + * Parcourt le dossier de toutes les simulation commencant par le prefix donné, + * et retourne le nombre de simulation terminées. + * + * @param asPrefixName simulation name (without number suffix) + * @param numberOfSimulation total simulation number + * + * @return le nombre de simulation réellement terminée + */ + protected int getNumberOfFinishedSimulation(String asPrefixName, int numberOfSimulation) { + + int numberOfFinishedSimulation = 0; + + // en sens inverse, il le fera carrement moins souvent + for (int simulationIndex = numberOfSimulation - 1; simulationIndex >= 0 ; --simulationIndex) { + String currentId = asPrefixName + "_" + simulationIndex; + if (SimulationStorage.localyExists(currentId)) { + SimulationControl currentSimulationControl = new SimulationControl(currentId); + SimulationStorage.readControl(currentId, currentSimulationControl); + + // condition for simulation "end" + if (currentSimulationControl.getProgress() > 0 + && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { + + // new finished simulation found + numberOfFinishedSimulation++; + } + else { + if (log.isDebugEnabled()) { + log.debug("Miss simulation number = " + simulationIndex); + } + + // no need to continue + // if only miss one, break + break; + } + } + else { + break; + } + } + + return numberOfFinishedSimulation; + } + + /** + * Parcourt les dossiers et instancie les storages une fois + * qu'on est sur qu'on a toutes les simulations. + * + * @param asPrefixName simulation name (without number suffix) + * @param numberOfSimulation total simulation number + * + * @return la liste des storages + */ + protected List<SimulationStorage> getStorageListForSecondPass(String asPrefixName, int numberOfSimulation) { + + // simulation start at 0 + List<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); + // en sens inverse, il le fera carrement moins souvent + for (int simulationIndex = 0; simulationIndex < numberOfSimulation; ++simulationIndex) { + String currentId = asPrefixName + "_" + simulationIndex; + SimulationStorage storage = SimulationStorage.getSimulation(currentId); + // always add first (loop in reverse order) + // result list is keeped sorted + simulationStorageForAnalyze.add(storage); + } + + return simulationStorageForAnalyze; + } + + /** * Convertit une collection de string, en une chaine * séparée par des ",". *

1 0

r2268 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 13:23:59 +0000 (Mon, 25 May 2009) New Revision: 2268 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx Log: Desactive l'UI seulement quand la cl?\195?\169 est trouv?\195?\169e Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-25 12:35:11 UTC (rev 2267) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-25 13:23:59 UTC (rev 2268) @@ -89,7 +89,7 @@ // if ssh key is set, must be a valid file currentSSHKey = new File(sshKeyField.getText().trim()); - if (!currentSSHKey.exists()) { + if (!currentSSHKey.isFile()) { setColor(true, sshKeyField); } else {

1 0

r2267 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 25 May '09

25 May '09

Author: chatellier Date: 2009-05-25 12:35:11 +0000 (Mon, 25 May 2009) New Revision: 2267 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Parcours des storages pour la second passe en ordre inverse, mais garde la liste resultante ordon?\195?\169e. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 11:03:17 UTC (rev 2266) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 12:35:11 UTC (rev 2267) @@ -25,12 +25,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.rmi.RemoteException; -import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.Iterator; -import java.util.List; +import java.util.LinkedList; import java.util.Map; import java.util.Properties; import java.util.SortedSet; @@ -641,9 +640,9 @@ String simulationCommonPrefix = simulationId.substring(0, simulationId.lastIndexOf("_")); // simulation start at 0 - List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>(); + LinkedList<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); // en sens inverse, il le fera carrement moins souvent - for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; simulationIndex++) { + for (int simulationIndex = numberOfSimulation - 1; simulationIndex >= 0 ; --simulationIndex) { String currentId = simulationCommonPrefix + "_" + simulationIndex; if (SimulationStorage.localyExists(currentId)) { SimulationControl currentSimulationControl = new SimulationControl(currentId); @@ -653,7 +652,9 @@ if (currentSimulationControl.getProgress() > 0 && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { SimulationStorage storage = SimulationStorage.getSimulation(currentId); - simulationStorageForAnalyze.add(storage); + // always add first (loop in reverse order) + // result list is keeped sorted + simulationStorageForAnalyze.addFirst(storage); if (log.isDebugEnabled()) { log.debug("Found simulation number = " + simulationIndex); }

1 0