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

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-03-08 12:55:36 -0600 (Fri, 08 Mar 2013)
New Revision: 6353

Modified:
   branches/faster/src/org/griphyn/vdl/karajan/lib/Range.java
   branches/faster/src/org/griphyn/vdl/karajan/lib/SwiftFunction.java
Log:
properly wait for parameters in range()

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/Range.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/Range.java	2013-03-08 18:54:51 UTC (rev 6352)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/Range.java	2013-03-08 18:55:36 UTC (rev 6353)
@@ -58,6 +58,10 @@
 	    DSHandle from = this.from.getValue(stack);
 	    DSHandle to = this.to.getValue(stack);
 	    DSHandle step = this.step.getValue(stack);
+	    
+	    waitFor(this, from);
+	    waitFor(this, to);
+	    waitFor(this, step);
 		final Type type = from.getType();
 		final double start = ((Number) from.getValue()).doubleValue();
 		final double stop = ((Number) to.getValue()).doubleValue();

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/SwiftFunction.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/SwiftFunction.java	2013-03-08 18:54:51 UTC (rev 6352)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/SwiftFunction.java	2013-03-08 18:55:36 UTC (rev 6353)
@@ -354,6 +354,10 @@
         return v;
     }
 	
+	protected static void waitFor(Node n, DSHandle h) {
+        ((AbstractDataNode) h).waitFor(n);
+    }
+	
 	public static Channel<Object> unwrapAll(Node who, Channel<AbstractDataNode> vargs) throws ExecutionException {
 		waitForAll(who, vargs);
 		MemoryChannel<Object> mc = new MemoryChannel<Object>();