[Swift-commit] r4541 - SwiftApps/SwiftR/Swift/exec

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-06-01 14:56:02 -0500 (Wed, 01 Jun 2011)
New Revision: 4541

Modified:
   SwiftApps/SwiftR/Swift/exec/rserver.swift
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
Added option to R server to choose whether "warmup" job is executed or not.


Modified: SwiftApps/SwiftR/Swift/exec/rserver.swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/rserver.swift	2011-06-01 19:36:46 UTC (rev 4540)
+++ SwiftApps/SwiftR/Swift/exec/rserver.swift	2011-06-01 19:56:02 UTC (rev 4541)
@@ -5,7 +5,6 @@
 #        needs to select between EvalRPersistent and simple RunR
 #        enable persistent for local mode (not sure how)
 #        condense stdout/err to 1 file
-#        replace ack with ftracef to result pipe
 #        condense shellscript and rserverscript to one?
 
 app (external e, RData result, file stout, file sterr) runR (file shellscript, file RServerScript, RData rcall, RData exports[])
@@ -46,7 +45,9 @@
   }
 }
 
-passivate();
+if (@arg("warmup", "false") == "true") {
+    passivate();
+}
 
 string pipedir = @arg("pipedir");
 global string requestPipeName = @strcat(pipedir,"/requestpipe");

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-06-01 19:36:46 UTC (rev 4540)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-06-01 19:56:02 UTC (rev 4541)
@@ -754,7 +754,10 @@
 
 fi
 
-$SWIFTRBIN/../swift/bin/swift $swiftLoggingFlag -config cf -tc.file tc -sites.file sites.xml $script -pipedir=$(pwd) >& $out </dev/null
+$SWIFTRBIN/../swift/bin/swift $swiftLoggingFlag \
+        -config cf -tc.file tc -sites.file sites.xml $script -pipedir=$(pwd) \
+        -warmup=true \
+        >& $out </dev/null
 exitcode=$?
 # Do any cleanup if swift exits in this manner
 if [ "$exitcode" != 0 ]; then