Changeset 6700

Timestamp:

Sep 14, 2018 4:35:02 PM (6 years ago)

Author:

clarksm

Message:

Added <meta> stanza to track history of driver generation
and indicate if job is agent or human generated.

Location:

branches/1.7

Files:

• gui/apps/execute.tcl (modified) (2 diffs)
• gui/apps/launcher.tcl (modified) (2 diffs)
• gui/scripts/tool.tcl (modified) (1 diff)
• lang/tcl/scripts/task.tcl (modified) (19 diffs)

branches/1.7/gui/apps/execute.tcl

@@ -39 +39 @@
     value -output ""
     value -cleanup no
+    value -xmlSource ""
 }
 
@@ -85 +86 @@
     }
 }
-
-set TaskObj [Rappture::Task ::#auto $toolobj $installdir]
+if {[$driverobj element -as type meta] ne ""} {
+    $toolobj copy meta from $driverobj meta
+}
+
+if {$params(-xmlSource) != ""} {
+    set TaskObj [Rappture::Task ::#auto $toolobj $installdir -xmlSource $params(-xmlSource)]
+} else {
+    set TaskObj [Rappture::Task ::#auto $toolobj $installdir]
+}
 set LogFid ""
 

branches/1.7/gui/apps/launcher.tcl

@@ -150 +150 @@
                 set dir [file dirname [info script]]
                 set mainscript [file join $dir execute.tcl]
+                lappend alist -xmlSource rapptureExecute
             }
             -tool {
@@ -246 +247 @@
                 -output @default \
                 -status rappture.status \
-                -cleanup yes]
+                -cleanup yes \
+                -xmlSource toolParameters]
         }
         "" - "-input" {

branches/1.7/gui/scripts/tool.tcl

@@ -68 +68 @@
 
     set _task [Rappture::Task ::#auto $xmlobj $installdir \
+        -xmlSource rapptureUI \
         -logger ::Rappture::Logger::log]
 

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

@@ -17 +17 @@
 # ======================================================================
 package require BLT
+package require uuid
 
 itcl::class Rappture::Task {
@@ -39 +40 @@
     public variable jobstats Rappture::Task::MiddlewareTime
     public variable resultdir "@default"
+    public variable xmlSource ""
 
     constructor {xmlobj installdir args} { # defined below }
@@ -64 +66 @@
     private common jobnum 0          ;# counter for unique job number
     private variable _uq
-    
+
     private variable _job
-    
+
     # get global resources for this tool session
     public proc resources {{option ""}}
@@ -250 +252 @@
         if { $_uq(type) == "" } {
             set cmd [GetSimulationCommand $driverFile]
+            global env
+            set ::env(RAPPTURE_UQ) False
         } else {
             set cmd [GetUQSimulationCommand $driverFile]
+            global env
+            set ::env(RAPPTURE_UQ) True
         }
         if { $cmd == "" } {
@@ -424 +430 @@
     $xmlobj put output.filename $filename
     $xmlobj put output.version $Rappture::version
-    
+
     if {[info exists ::tcl_platform(user)]} {
         $xmlobj put output.user $::tcl_platform(user)
@@ -540 +546 @@
     global rapptureInfo
     set fileName [file join $rapptureInfo(cwd) "driver[pid].xml"]
+#
+# Remove existing <meta> section
+    $_xmlobj remove "meta"
+# Copy original <meta> section
+    $_xmlobj copy "meta" from $_origxml "meta"
+# Add new <meta> entry
+    if { $xmlSource != "" } {
+        set identifier [uuid::uuid generate]
+        $_xmlobj put meta.driver($identifier).source $xmlSource
+        $_xmlobj put meta.driver($identifier).version $::Rappture::build
+        $_xmlobj put meta.driver($identifier).time [clock format [clock seconds]]
+        if { $xmlSource == "rapptureUI" } {
+            $_xmlobj put meta.generated human
+        }
+        set generated [$_xmlobj get meta.generated]
+        if { $generated == "" } {
+            $_xmlobj put meta.generated human
+        }
+        set generated [$_xmlobj get meta.generated]
+        global env
+        set ::env(RAPPTURE_GENERATED) $generated
+        if {[info exists env(RAPPTURE_GENERATED_FILE)]} {
+            set f [open $env(RAPPTURE_GENERATED_FILE) w]
+            puts $f "generated $generated"
+            close $f
+        }
+    }
+#
     if { [catch {
         set f [open $fileName w]
@@ -673 +707 @@
     } elseif { $token == "abort" }  {
         # The user pressed the abort button.
-        
+
         set logmesg "Program terminated by user."
         Log run failed [list $logmesg]
@@ -680 +714 @@
     } else {
         # Abnormal termination
-        
+
         set logmesg "Abnormal program termination:"
         Log run failed [list $logmesg]
@@ -712 +746 @@
         set simulation "[pid]_${toolId}_r${toolVers}"
     }
-    
+
     # Need to save job info? then invoke the callback
     if { [string length $jobstats] > 0} {
@@ -724 +758 @@
         uplevel #0 $jobstats $args 
     }
-        
+
     #
     # Scan through stderr channel and look for statements that
@@ -732 +766 @@
     # MiddlewareTime: job=1 event=simulation start=3.001094 ...
     #
-    
+
     set subjobs 0
     set pattern {(^|\n)MiddlewareTime:( +[a-z]+=[^ \n]+)+(\n|$)}
@@ -756 +790 @@
         set data(event) "subsimulation"
         set data(start) [expr { $times(start) + $data(start) }]
-        
+
         set details ""
         foreach key {job event start walltime cputime status} {
@@ -767 +801 @@
             lappend details $key $data($key)
         }
-        
+
         if {[string length $jobstats] > 0} {
             uplevel #0 $jobstats $details
         }
-        
+
         incr subjobs
-        
+
         # Done -- remove this statement
         set _job(stderr) [string replace $_job(stderr) $p0 $p1]
@@ -803 +837 @@
         set simulation "[pid]_${toolId}_r${toolVers}"
     }
-    
+
 #   job info is not required because jobprotocol = submit
 #   if { [string length $jobstats] > 0} {
@@ -815 +849 @@
 #       uplevel #0 $jobstats $args 
 #   }
-        
+
 # [click] messages go here
     if { [string length $jobstats] > 0} {
@@ -827 +861 @@
         uplevel #0 $jobstats $args 
     }
-        
+
     #
     # Scan through stderr channel and look for statements that
@@ -835 +869 @@
     # MiddlewareTime: job=1 event=simulation start=3.001094 ...
     #
-    
+
     set subjobs 0
     set pattern {(^|\n)MiddlewareTime:( +[a-z]+=[^ \n]+)+(\n|$)}
@@ -859 +893 @@
         set data(event) "subsimulation"
         set data(start) [expr { $times(start) + $data(start) }]
-        
+
         set details ""
         foreach key {job event start walltime cputime status} {
@@ -870 +904 @@
             lappend details $key $data($key)
         }
-        
+
 #       if {[string length $jobstats] > 0} {
 #           uplevel #0 $jobstats $details
 #       }
-        
+
         incr subjobs
-        
+
         # Done -- remove this statement
         set _job(stderr) [string replace $_job(stderr) $p0 $p1]