[Swift-commit] r6252 - branches/faster/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-02-08 23:29:51 -0600 (Fri, 08 Feb 2013)
New Revision: 6252

Modified:
   branches/faster/src/org/griphyn/vdl/karajan/Loader.java
Log:
use .swiftx for intermediate code and fix cache id

Modified: branches/faster/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/Loader.java	2013-02-09 05:28:44 UTC (rev 6251)
+++ branches/faster/src/org/griphyn/vdl/karajan/Loader.java	2013-02-09 05:29:51 UTC (rev 6252)
@@ -47,7 +47,6 @@
 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;
@@ -217,7 +216,7 @@
             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;
             }
@@ -287,7 +286,7 @@
         File swiftscript = new File(project);
         debugText("SWIFTSCRIPT", swiftscript);
         String projectBase = project.substring(0, project.lastIndexOf('.'));
-        File xml = new File(projectBase + ".xml");
+        File xml = new File(projectBase + ".swiftx");
         File kml = new File(projectBase + ".kml");
 
         loadBuildVersion(provenanceEnabled);
@@ -309,7 +308,8 @@
                 recompile = true;
             }
             else {
-                String prefix = "<!-- CACHE ID ";
+            	firstLine = firstLine.trim();
+                String prefix = "// CACHE ID ";
                 int offset = firstLine.indexOf(prefix);
                 if (offset < 0) {
                     // no build version in the KML
@@ -318,9 +318,7 @@
                     recompile = true;
                 }
                 else {
-                    String cut = firstLine.substring(offset + prefix.length());
-                    int endOffset = cut.indexOf(" -->");
-                    String kmlversion = cut.substring(0, endOffset);
+                    String kmlversion = firstLine.substring(offset + prefix.length());
                     logger.debug("kmlversion is >" + kmlversion + "<");
                     logger.debug("build version is >" + buildVersion + "<");
                     if (!(kmlversion.equals(buildVersion))) {