Changeset 6715 for branches

Timestamp:

Mar 24, 2020 4:50:54 PM (3 years ago)

Author:

clarksm

Message:

Record [click] events when cache hit occurs.
Record squid with [click] event and with submit --local <command>

File:

• branches/1.7/lang/tcl/scripts/task.tcl (modified) (10 diffs)

branches/1.7/lang/tcl/scripts/task.tcl

@@ -253 +253 @@
         success  0
         xmlobj   ""
+        squid    ""
     }
 
@@ -258 +259 @@
 
     set helperEligible [IsCacheHelperEligible]
+    if { [info exists env(WHIMRC)] } {
+        set helperEligible 0
+    }
 
     set driverFile [GetDriverFile]
@@ -274 +278 @@
         }
         global env
+        if { $helperEligible } {
+            if { $_job(squid) != "" } {
+                set ::env(RAPPTURE_CACHE_SQUID) $_job(squid)
+            }
+        }
+#       puts stderr "RAPPTURE_CACHE_SQUID = $::env(RAPPTURE_CACHE_SQUID)"
         if { $_uq(type) == "" } {
             if { $helperEligible } {
@@ -293 +303 @@
             return [list 1 $mesg]
         }
-        Rappture::rusage mark
+
         if { ![ExecuteSimulationCommand $cmd] } {
             return [list 1 $_job(mesg)]
@@ -908 +918 @@
         foreach key [array names data] {
             # Add anything else that the client gave -- venue, etc.
-            lappend details $key $data($key)
+            if { $data($key) != "" } {
+                lappend details $key $data($key)
+            }
         }
 
@@ -975 +987 @@
                          "cputime"  0 \
                          "status"   0
+            if { $_job(squid) != "" } {
+                lappend args "squid" $_job(squid)
+            }
             uplevel #0 $jobstats $args
         }
@@ -1002 +1017 @@
             cputime 0
             status 0
+            squid ""
         }
         foreach arg [lrange [string range $_job(stderr) $p0 $p1] 1 end] {
@@ -1021 +1037 @@
         foreach key [array names data] {
             # Add anything else that the client gave -- venue, etc.
-            lappend details $key $data($key)
+            if { $data($key) != "" } {
+                lappend details $key $data($key)
+            }
         }
 
@@ -1073 +1091 @@
 
 itcl::body Rappture::Task::LogCachedSimulationUsage {} {
+    Rappture::rusage mark
+    array set times [Rappture::rusage measure]
+
+    if { [string length $jobstats] > 0} {
+        set recordJobstats 1
+        if { [info exists _resources(-cacheuser)] } {
+            global env
+            if { $env(USER) eq $_resources(-cacheuser) } {
+                set recordJobstats 0
+            }
+        }
+        if { $recordJobstats } {
+            if { $_uq(type) != "" } {
+                if { [string length $jobstats] > 0} {
+                    lappend args "job"      [incr jobnum] \
+                                 "event"    "\[click-uq\]" \
+                                 "start"    $times(start) \
+                                 "walltime" 0 \
+                                 "cputime"  0 \
+                                 "status"   0 \
+                                 "squid"    $_job(squid)
+                    uplevel #0 $jobstats $args
+                }
+            } else {
+                lappend args "job"      [incr jobnum] \
+                             "event"    "\[click\]" \
+                             "start"    $times(start) \
+                             "walltime" 0 \
+                             "cputime"  0 \
+                             "status"   0 \
+                             "squid"    $_job(squid)
+                uplevel #0 $jobstats $args
+            }
+        }
+    }
+
     if { [catch {
         Rappture::library $_job(runfile)
@@ -1110 +1164 @@
         }
     }
+    set _job(squid) $squid
+
 #   puts stderr "SQUID = $headers(etag)"
 #   puts stderr "SQUID = $squid"