Changeset 731 for trunk/gui/scripts

Timestamp:

May 12, 2007 3:33:40 PM (17 years ago)

Author:

mmc

Message:

Fixed tool execution to honor the new "job_protocol" directive.
If job_protocol in the resources file is set to "submit", then
the job is exec'd as "submit --local ...", so the new submit
command can handle job execution and timing stats. We'll roll
this out for a few tools first. Eventually, all tools will use
"submit" and we'll remove the job_protocol entirely.

File:

• trunk/gui/scripts/tool.tcl (modified) (5 diffs)

trunk/gui/scripts/tool.tcl

@@ -44 +44 @@
     public proc setHubURL {name}  { set _resources(-huburl) $name }
     public proc setSession {name} { set _resources(-session) $name }
+    public proc setJobPrt {name}  { set _resources(-jobprotocol) $name }
 }
 
@@ -53 +54 @@
         hub_name         Rappture::Tool::setHubName \
         hub_url          Rappture::Tool::setHubURL \
-        session_token    Rappture::Tool::setSession
+        session_token    Rappture::Tool::setSession \
+        job_protocol     Rappture::Tool::setJobPrt
 }
                                                                                 
@@ -82 +84 @@
         return [array get _resources]
     }
-    if {![info exists _resources($option)]} {
-        error "bad option \"$option\": should be [join [array names _resources] {, }]"
-    }
-    return $_resources($option)
+    if {[info exists _resources($option)]} {
+        return $_resources($option)
+    }
+    return ""
 }
 
@@ -170 +172 @@
         set cmd [string trimleft $cmd " "]
 
+        # if job_protocol is "submit", then use use submit command
+        if {[resources -jobprotocol] == "submit"} {
+            set cmd [linsert $cmd 0 submit --local]
+        }
+
         # starting job...
         Rappture::rusage mark
@@ -177 +184 @@
             set job(output) [string range $cmd 5 end] 
         } else {
-        set status [catch {eval blt::bgexec \
-            ::Rappture::Tool::job(control) \
-            -keepnewline yes \
-            -killsignal SIGTERM \
-            -onoutput [list [itcl::code $this _output]] \
-            -output ::Rappture::Tool::job(output) \
-            -error ::Rappture::Tool::job(error) $cmd} result]
+            set status [catch {eval blt::bgexec \
+                ::Rappture::Tool::job(control) \
+                -keepnewline yes \
+                -killsignal SIGTERM \
+                -onoutput [list [itcl::code $this _output]] \
+                -output ::Rappture::Tool::job(output) \
+                -error ::Rappture::Tool::job(error) $cmd} result]
         }
         # ...job is finished