Changeset 734

Timestamp:

May 12, 2007, 7:12:48 PM (17 years ago)

Author:

mmc

Message:

Fixed the handling for "job_protocol=submit" so that it doesn't print
out any MiddlewareTime? statements. This avoids double-counting of
jobs in that case.

File:

• trunk/gui/scripts/tool.tcl (modified) (1 diff)

trunk/gui/scripts/tool.tcl

@@ -194 +194 @@
         # ...job is finished
         array set times [Rappture::rusage measure]
-        puts stderr "MiddlewareTime: job=[incr jobnum] event=simulation start=$times(start) walltime=$times(walltime) cputime=$times(cputime) status=$status"
-
-        #
-        # Scan through stderr channel and look for statements that
-        # represent grid jobs that were executed.  The statements
-        # look like this:
-        #
-        # MiddlewareTime: job=1 event=simulation start=3.001094 ...
-        #
-        set subjobs 0
-        while {[regexp -indices {(^|\n)MiddlewareTime:( +[a-z]+=[^ \n]+)+(\n|$)} $job(error) match]} {
-            foreach {p0 p1} $match break
-            if {[string index $job(error) $p0] == "\n"} { incr p0 }
-
-            catch {unset data}
-            array set data {
-                job 1
-                event simulation
-                start 0
-                walltime 0
-                cputime 0
-                status 0
+
+        if {[resources -jobprotocol] != "submit"} {
+            puts stderr "MiddlewareTime: job=[incr jobnum] event=simulation start=$times(start) walltime=$times(walltime) cputime=$times(cputime) status=$status"
+
+            #
+            # Scan through stderr channel and look for statements that
+            # represent grid jobs that were executed.  The statements
+            # look like this:
+            #
+            # MiddlewareTime: job=1 event=simulation start=3.001094 ...
+            #
+            set subjobs 0
+            while {[regexp -indices {(^|\n)MiddlewareTime:( +[a-z]+=[^ \n]+)+(\n|$)} $job(error) match]} {
+                foreach {p0 p1} $match break
+                if {[string index $job(error) $p0] == "\n"} { incr p0 }
+
+                catch {unset data}
+                array set data {
+                    job 1
+                    event simulation
+                    start 0
+                    walltime 0
+                    cputime 0
+                    status 0
+                }
+                foreach arg [lrange [string range $job(error) $p0 $p1] 1 end] {
+                    foreach {key val} [split $arg =] break
+                    set data($key) $val
+                }
+                set data(job) [expr {$jobnum+$data(job)}]
+                set data(event) "subsimulation"
+                set data(start) [expr {$times(start)+$data(start)}]
+
+                set stmt "MiddlewareTime:"
+                foreach key {job event start walltime cputime status} {
+                    # add required keys in a particular order
+                    append stmt " $key=$data($key)"
+                    unset data($key)
+                }
+                foreach key [array names data] {
+                    # add anything else that the client gave -- venue, etc.
+                    append stmt " $key=$data($key)"
+                }
+                puts stderr $stmt
+                incr subjobs
+
+                # done -- remove this statement
+                set job(error) [string replace $job(error) $p0 $p1]
             }
-            foreach arg [lrange [string range $job(error) $p0 $p1] 1 end] {
-                foreach {key val} [split $arg =] break
-                set data($key) $val
-            }
-            set data(job) [expr {$jobnum+$data(job)}]
-            set data(event) "subsimulation"
-            set data(start) [expr {$times(start)+$data(start)}]
-
-            set stmt "MiddlewareTime:"
-            foreach key {job event start walltime cputime status} {
-                # add required keys in a particular order
-                append stmt " $key=$data($key)"
-                unset data($key)
-            }
-            foreach key [array names data] {
-                # add anything else that the client gave -- venue, etc.
-                append stmt " $key=$data($key)"
-            }
-            puts stderr $stmt
-            incr subjobs
-
-            # done -- remove this statement
-            set job(error) [string replace $job(error) $p0 $p1]
-        }
-        incr jobnum $subjobs
+            incr jobnum $subjobs
+        }
 
     } else {