Changeset 6702 for branches/1.7

Timestamp:

Sep 27, 2018 2:24:29 PM (6 years ago)

Author:

clarksm

Message:

Push empty <current> tags for rappture -execute to driver file
Examine HTTP headers to determine cache SQUID

Location:

branches/1.7

Files:

• gui/apps/execute.tcl (modified) (1 diff)
• lang/tcl/scripts/task.tcl (modified) (11 diffs)

branches/1.7/gui/apps/execute.tcl

@@ -82 +82 @@
 # copy structure.current.fields and structure.current.components
 foreach path [Rappture::entities -as path $driverobj input] {
-    if {[$driverobj element -as type $path.current] eq ""} {
+    if       {[$driverobj element -as type $path.current] eq ""} {
+# if element has no current tag copy it
         $toolobj copy $path from $driverobj $path
+    } elseif {[$driverobj get $path.current] eq ""} {
+# if element has current tag and it is empty and toolobj is missing the element
+        if {[$toolobj element -as type $path.current] eq ""} {
+            $toolobj copy $path.current from $driverobj $path.current
+        }
     }
 }

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

@@ -226 +226 @@
 
     # Initialize job array variables
-    array set _job { 
+    array set _job {
         control  ""
         exitcode 0
@@ -237 +237 @@
     }
 
-    SetCpuResourceLimit 
+    SetCpuResourceLimit
     set driverFile [GetDriverFile]
     set cached 0
     if { [IsCacheable] } {
 puts stderr "Cache checking: [time {
-        set cached [CheckForCachedRunFile $driverFile] 
+        set cached [CheckForCachedRunFile $driverFile]
      } ]"
 puts stderr "checking cache=$cached"
@@ -674 +674 @@
         set _job(mesg) ""
         return 1;                       # Success
-    } 
+    }
 
     # Step 3. Execute the command, collecting its stdout and stderr.
@@ -697 +697 @@
             if {$_job(exitcode) > 128} {
                 set logmesg "Program signaled: signal was [GetSignal $_job(exitcode)]"
-            } else { 
+            } else {
                 set logmesg "Program finished: non-zero exit code is $_job(exitcode)"
             }
@@ -756 +756 @@
             "cputime"  $times(cputime) \
             "status"   $_job(exitcode)
-        uplevel #0 $jobstats $args 
+        uplevel #0 $jobstats $args
     }
 
@@ -847 +847 @@
 #           "cputime"  $times(cputime) \
 #           "status"   $_job(exitcode)
-#       uplevel #0 $jobstats $args 
+#       uplevel #0 $jobstats $args
 #   }
 
@@ -859 +859 @@
             "cputime"  0 \
             "status"   0
-        uplevel #0 $jobstats $args 
+        uplevel #0 $jobstats $args
     }
 
@@ -940 +940 @@
             "cputime"  0 \
             "status"   0
-        uplevel #0 $jobstats $args 
+        uplevel #0 $jobstats $args
     }
 
@@ -960 +960 @@
         error "Can't create rappture library: $xmlobj"
     }
-    # Get the session from runfile 
+    # Get the session from runfile
     set session [$xmlobj get "output.session"]
     if { [catch {exec submit --cache $session} result] != 0 } {
@@ -984 +984 @@
         return 0
     }
+
+#   puts stderr "ncode  = [http::ncode $token]"
+#   puts stderr "code   = [::http::code $token]"
+#   puts stderr "status = [::http::status $token]"
+#   puts stderr "meta   = [::http::meta $token]"
+
+    foreach {key value} [::http::meta $token] {
+        set headers([string tolower $key]) $value
+        if { [string tolower $key] == "etag" } {
+            set guid $value
+        }
+    }
+#   puts stderr "SQUID = $headers(etag)"
+#   puts stderr "SQUID = $guid"
+
     # If the code isn't 200, we'll assume it's a cache miss.
     if { [http::ncode $token] != 200} {
         return 0
     }
-    # Get contents of the run file. 
+    # Get contents of the run file.
     set contents [http::data $token]
     if { $contents == "" } {
@@ -994 +1009 @@
     }
 
-    # Create a new run.xml file and write the results into it. 
+    # Create a new run.xml file and write the results into it.
     set secs [clock seconds]
     set millisecs [expr [clock clicks -milliseconds] % 1000]