Author: chatellier Date: 2009-10-27 10:54:43 +0000 (Tue, 27 Oct 2009) New Revision: 2697 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: With new launcher architecture, control file should be alwaus saved Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-10-27 10:39:30 UTC (rev 2696) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-10-27 10:54:43 UTC (rev 2697) @@ -126,32 +126,28 @@ @Step(IsisConfig.STEP_AFTER_INIT_VCS) public static void simulateWithSimulationAndScript(String simulationId, File simulationZip, File simulationPrescript) throws Exception { - + if (log.isInfoEnabled()) { log.info("Command line action : simulateWithSimulation (" + simulationId + ", " + simulationZip.getAbsolutePath() + ", " + simulationPrescript + ")"); } String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); - - SimulationControl control = new SimulationControl(name); - // pour forcer le fichier de control a être sauver - // pour ensuite être lu par le processus parent - control.setAutoSaveState(true); - // lancement de la simulation SimulatorLauncher launcher = new InProcessSimulatorLauncher(); - + //SimulationStorage simulation = launcher.simulate(null, control, simulationZip); //simulation.getStorage().closeContext(); String simulationPrescriptContent = null; if (simulationPrescript != null && simulationPrescript.canRead()) { simulationPrescriptContent = FileUtil.readAsString(simulationPrescript); } + + SimulationControl control = new SimulationControl(name); launcher.simulate(null, control, simulationZip, simulationPrescriptContent); SimulationStorage simulation = launcher.getSimulationStorage(SimulationService.getService(), control); simulation.getStorage().closeContext(); - + // FIXME integrer ca dans le process normal d'init IsisFish.quit(); } @@ -212,12 +208,6 @@ String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); - SimulationControl control = new SimulationControl(name); - - // pour forcer le fichier de control a être sauver - // pour ensuite être lu par le processus parent - control.setAutoSaveState(true); - // lancement de la simulation SimulatorLauncher launcher = new InProcessSimulatorLauncher(); @@ -227,27 +217,19 @@ if (simulationPrescript != null && simulationPrescript.canRead()) { simulationPrescriptContent = FileUtil.readAsString(simulationPrescript); } + + SimulationControl control = new SimulationControl(name); launcher.simulate(null, control, simulationZip, simulationPrescriptContent); SimulationStorage simulationStorage = launcher.getSimulationStorage(SimulationService.getService(), control); - - // zip + md5 creation - //simulationStorage.createZip(simulationResultZip, true); - // close all resources - //simulationStorage.getStorage().closeContext(); - // FIXME more performant than simulationStorage.createZip - //ZipUtil.compressFiles(simulationResultZip, simulationStorage.getFile(), - // Collections.singletonList(new File(simulationStorage.getFile(), simulationStorage.getName())), true); - + // make result archive after simulation if (log.isInfoEnabled()) { log.info("Compressing simulation as zip : " + simulationResultArchive); if (log.isDebugEnabled()) { log.debug("Timing : before zipping results : " + new java.util.Date()); } } - ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); - if (log.isDebugEnabled()) { log.debug("Timing : after zipping results : " + new java.util.Date()); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-10-27 10:39:30 UTC (rev 2696) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-10-27 10:54:43 UTC (rev 2697) @@ -51,8 +51,6 @@ protected PropertyChangeSupport listeners = new PropertyChangeSupport(this); protected boolean inUpdateFromHashtable = false; protected transient SimulationStorage simulation = null; - /** si vrai des qu'une propriete change, sauvegarde sont etat */ - protected transient boolean autoSaveState = false; protected String id = null; protected boolean started = false; @@ -85,19 +83,6 @@ progressMax = 0; progress = 0; } - - /** - * - * @deprecated todo remove, should be always auto saved - * @param autoSaveState - */ - public void setAutoSaveState(boolean autoSaveState) { - this.autoSaveState = autoSaveState; - } - - public boolean isAutoSaveState() { - return autoSaveState; - } /** * Retourne la simulation associe a ce control @@ -110,8 +95,6 @@ return simulation; } - - public void addPropertyChangeListener(String propName, PropertyChangeListener l) { listeners.addPropertyChangeListener(propName, l); } @@ -409,7 +392,7 @@ } else { Object value = e.getNewValue(); update.put(property, value); - if (isAutoSaveState() && getSimulation() != null) { + if (getSimulation() != null) { getSimulation().saveControl(this); } } 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-10-27 10:39:30 UTC (rev 2696) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-27 10:54:43 UTC (rev 2697) @@ -121,10 +121,6 @@ control.setDate(new Date()); control.setProgress(0); control.setStarted(true); - - // FIXME temp auto save - // force saving of control file - control.setAutoSaveState(true); // replace prescript if specified on method if (simulationPrescript != null