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

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-02-08 23:27:53 -0600 (Fri, 08 Feb 2013)
New Revision: 6250

Modified:
   branches/faster/src/org/griphyn/vdl/karajan/lib/Stagein.java
   branches/faster/src/org/griphyn/vdl/karajan/lib/Stageout.java
Log:
negation operator got lost in translation

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/Stagein.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/Stagein.java	2013-02-09 05:26:59 UTC (rev 6249)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/Stagein.java	2013-02-09 05:27:53 UTC (rev 6250)
@@ -22,6 +22,7 @@
 
 import java.util.Collection;
 
+import k.rt.ConditionalYield;
 import k.rt.ExecutionException;
 import k.rt.Stack;
 import k.thr.LWThread;
@@ -36,7 +37,6 @@
 import org.globus.cog.karajan.compiled.nodes.Node;
 import org.globus.cog.karajan.futures.FutureFault;
 import org.globus.cog.karajan.parser.WrapperNode;
-import org.griphyn.vdl.engine.Karajan;
 import org.griphyn.vdl.mapping.AbstractDataNode;
 import org.griphyn.vdl.mapping.DependentException;
 import org.griphyn.vdl.mapping.MappingDependentException;
@@ -62,7 +62,7 @@
     public Node compile(WrapperNode w, Scope scope)
             throws CompilationException {
         Node def = getParent().getParent();
-        procName = Karajan.demangle(def.getTextualName());
+        procName = def.getTextualName();
         tracer = Tracer.getTracer(def, "APPCALL");
         return super.compile(w, scope);
     }
@@ -70,7 +70,7 @@
     @Override
     public Object function(Stack stack) {
         AbstractDataNode var = this.var.getValue(stack);
-        if (var.isPrimitive()) {
+        if (!var.isPrimitive()) {
             boolean deperr = false;
             boolean mdeperr = false;
             try {
@@ -90,7 +90,7 @@
                     stagein.add(filename(var.getField(p))[0]);
                 }
             }
-            catch (FutureFault f) {
+            catch (ConditionalYield f) {
                 if (tracer.isEnabled()) {
                     tracer.trace(LWThread.currentThread(), procName + " WAIT " + Tracer.getFutureName(f.getFuture()));
                 }

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/Stageout.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/Stageout.java	2013-02-09 05:26:59 UTC (rev 6249)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/Stageout.java	2013-02-09 05:27:53 UTC (rev 6250)
@@ -73,7 +73,7 @@
             var.waitFor(this);
         }
         try {
-            if (var.isPrimitive()) {
+            if (!var.isPrimitive()) {
                 retPaths(cr_stageout.get(stack), var);
             }
             if (var.isRestartable()) {