[Swift-commit] r5924 - trunk/resources

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-09-15 03:38:31 -0500 (Sat, 15 Sep 2012)
New Revision: 5924

Modified:
   trunk/resources/Karajan-no-provenance.stg
   trunk/resources/Karajan.stg
Log:
remove swift#cs when provenance is disabled; uniform mapper parameter names: swift#<name>

Modified: trunk/resources/Karajan-no-provenance.stg
===================================================================
--- trunk/resources/Karajan-no-provenance.stg	2012-09-14 22:34:44 UTC (rev 5923)
+++ trunk/resources/Karajan-no-provenance.stg	2012-09-15 08:38:31 UTC (rev 5924)
@@ -11,3 +11,5 @@
 variable_log() ::= << >>
 
 range_log() ::= << >>
+
+cs() ::= << >>

Modified: trunk/resources/Karajan.stg
===================================================================
--- trunk/resources/Karajan.stg	2012-09-14 22:34:44 UTC (rev 5923)
+++ trunk/resources/Karajan.stg	2012-09-15 08:38:31 UTC (rev 5924)
@@ -244,6 +244,10 @@
 </vdl:tparallelFor>
 >>
 
+cs() ::= <<
+	<set name="swift#cs"><variable>#thread</variable></set>
+>>
+
 // need to log inputs and outputs at the calling stage here because
 // they are not
 // $outputs:vdl_log_output();separator="\n"$
@@ -251,7 +255,7 @@
 callInternal(func, outputs, inputs, line) ::= <<
 <sequential>
 <unitStart name="$func$" type="INTERNALPROC" outputs="$outputs:list();separator=","$"/>
-<set name="swift#cs"><variable>#thread</variable></set>
+$cs()$
 <$func$ _traceline="$line$">
   <parallel>
     $outputs:callInternal_log_output();separator="\n"$
@@ -347,14 +351,14 @@
   <vdl:parameter name="file" value="$file.name$"/>
   $if(file.params)$$file.params;separator="\n"$$endif$
   $if(!waitfor)$
-  <vdl:parameter name="input" value="true" />
+  <vdl:parameter name="swift#input" value="true" />
   $endif$
 </vdl:mapping>
 $else$
 <vdl:mapping descriptor="$mapping.descriptor$">
   $mapping.params;separator="\n"$
   $if(!waitfor)$
-  <vdl:parameter name="input" value="true" />
+  <vdl:parameter name="swift#input" value="true" />
   $endif$
 </vdl:mapping>
 $endif$