Author: chatellier Date: 2009-07-07 10:15:31 +0000 (Tue, 07 Jul 2009) New Revision: 2472 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Add timing debug logs 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-07-07 09:09:10 UTC (rev 2471) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-07-07 10:15:31 UTC (rev 2472) @@ -206,6 +206,10 @@ log.info(" prescript file : " + simulationPrescript); } + if (log.isDebugEnabled()) { + log.debug("Timing : init isis simulation action : " + new java.util.Date()); + } + 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); @@ -237,9 +241,17 @@ 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()); + } + simulationStorage.getStorage().closeContext(); // remove simulation @@ -248,6 +260,10 @@ } simulationStorage.delete(false); + if (log.isDebugEnabled()) { + log.debug("Timing : end isis simulation action : " + new java.util.Date()); + } + // FIXME integrer ca dans le process normal d'init IsisFish.quit(); } 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-07-07 09:09:10 UTC (rev 2471) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-07-07 10:15:31 UTC (rev 2472) @@ -104,9 +104,15 @@ } } + if (log.isDebugEnabled()) { + log.debug("Timing : before import zip : " + new java.util.Date()); + } simulation = SimulationStorage .importAndRenameZip(simulationZip, id); - + if (log.isDebugEnabled()) { + log.debug("Timing : after import zip : " + new java.util.Date()); + } + // add missing control informations // TODO again region database directory hack // force region reading in simulation directory @@ -414,10 +420,10 @@ SimulationContext context = SimulationContext.get(); - context.closeDB(); - context.closeDBResult(); + //context.closeDB(); + //context.closeDBResult(); - try { + /*try { // close all transaction if (context.getSimulationStorage() != null) { context.getSimulationStorage().closeMemStorage(); @@ -427,7 +433,7 @@ if (log.isWarnEnabled()) { log.warn("Can't close all transaction", eee); } - } + }*/ SimulationContext.remove();