[Swift-commit] r6211 - branches/faster/src/org/griphyn/vdl/karajan
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Fri Feb 1 20:08:48 CST 2013
Author: hategan
Date: 2013-02-01 20:08:47 -0600 (Fri, 01 Feb 2013)
New Revision: 6211
Modified:
branches/faster/src/org/griphyn/vdl/karajan/Loader.java
Log:
add command line properties before compiling
Modified: branches/faster/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/Loader.java 2013-02-02 02:07:50 UTC (rev 6210)
+++ branches/faster/src/org/griphyn/vdl/karajan/Loader.java 2013-02-02 02:08:47 UTC (rev 6211)
@@ -47,6 +47,7 @@
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.globus.cog.abstraction.impl.execution.fake.JobSubmissionTaskHandler;
import org.globus.cog.karajan.compiled.nodes.Main;
import org.globus.cog.karajan.compiled.nodes.grid.AbstractGridNode;
import org.globus.cog.karajan.parser.WrapperNode;
@@ -194,6 +195,12 @@
context.setAttribute("SWIFT:RUN_ID", runID);
context.setAttribute("SWIFT:DRY_RUN", ap.isPresent(ARG_DRYRUN));
context.setAttribute("SWIFT:HOME", System.getProperty("swift.home"));
+
+ addCommandLineProperties(config, ap);
+ if (logger.isDebugEnabled()) {
+ logger.debug(config);
+ }
+ debugSitesText(config);
Main root = compileKarajan(tree, context);
root.setFileName(projectName);
@@ -204,19 +211,13 @@
if (ap.hasValue(ARG_RESUME)) {
arguments.add("-rlog:resume=" + ap.getStringValue(ARG_RESUME));
}
-
- addCommandLineProperties(config, ap);
- if (logger.isDebugEnabled()) {
- logger.debug(config);
- }
- debugSitesText(config);
-
+
new HangChecker(context).start();
long start = System.currentTimeMillis();
ec.start(context);
ec.waitFor();
long end = System.currentTimeMillis();
- //System.out.println(JobSubmissionTaskHandler.jobsRun + " jobs, " + JobSubmissionTaskHandler.jobsRun * 1000 / (end - start) + " j/s");
+ System.out.println(JobSubmissionTaskHandler.jobsRun + " jobs, " + JobSubmissionTaskHandler.jobsRun * 1000 / (end - start) + " j/s");
if (ec.isFailed()) {
runerror = true;
}
More information about the Swift-commit
mailing list