Changeset 6176 for branches/1.6

Timestamp:

Mar 22, 2016, 7:16:03 AM (9 years ago)

Author:

gah

Message:

update w/ changes to cache hit reporting

Location:

branches/1.6

Files:

• examples/zoo/string/string.tcl (modified) (1 diff)
• examples/zoo/string/tool.xml (modified) (1 diff)
• lang/tcl/scripts/task.tcl (modified) (15 diffs)

branches/1.6/examples/zoo/string/string.tcl

@@ -20 +20 @@
 $driver put output.string(outi).about.label "Echo of input"
 $driver put output.string(outi).current $indeck
-puts stderr "This is an error message."
-exit 10
 
 # save the updated XML describing the run...
 Rappture::result $driver
+exit 0

branches/1.6/examples/zoo/string/tool.xml

@@ -11 +11 @@
   </about>
   <command>
-    tclsh @tool/string.tcl @driver
+    python @tool/string_test.py @driver
   </command>
 </tool>

branches/1.6/lang/tcl/scripts/task.tcl

@@ -19 +19 @@
 
 itcl::class Rappture::Task {
-    private method CheckCacheForRunFile { driverFile }
+    private method CheckForCachedRunFile { driverFile }
     private method CollectUQResults {}
     private method ExecuteSimulationCommand { cmd }
@@ -50 +50 @@
     public method save {xmlobj {name ""}}
 
-    protected method _output {data}
+    protected method OnOutput {data}
     protected method Log {args}
     protected method BuildSubmitCommand {cmd tfile params_file}
@@ -138 +138 @@
 itcl::body Rappture::Task::GetSignal {code} {
     set signals {
-        HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV 
+        xxx HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV 
         USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN 
         TTOU URG XCPU XFSZ VTALRM PROF WINCH POLL PWR SYS 
@@ -229 +229 @@
     set cached 0
     if { [IsCacheable] } {
+puts stderr "Cache checking: [time {
         set cached [CheckForCachedRunFile $driverFile] 
+     } ]"
+puts stderr "checking cache=$cached"
     }
     if { !$cached } {
+puts stderr "1._uq(type)=$_uq(type)"
         if { $_uq(type) != "" } {
             set _uq(tfile) [GetUQTemplateFile]
@@ -240 +244 @@
             set cmd [GetUQSimulationCommand $driverFile]
         }
+puts stderr "2. cmd=$cmd"
         if { $cmd == "" } {
             puts stderr "cmd is empty"
@@ -249 +254 @@
         }
         Rappture::rusage mark
+puts stderr "3. _uq(type)=$_uq(type)"
         if { ![ExecuteSimulationCommand $cmd] } {
+puts stderr "4. job(mesg)=$_job(mesg)"
             return [list 1 $_job(mesg)]
         }
-        if { $_uq(type) != "" } {
-            CollectUQResults
-        }
+puts stderr "5. _uq(type)=$_uq(type)"
         if { [resources -jobprotocol] == "submit" } {
             LogSubmittedSimulationUsage
@@ -412 +417 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _output <data>
+# USAGE: OnOutput <data>
 #
 # Used internally to send each bit of output <data> coming from the
 # tool onto the caller, so the user can see progress.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Task::_output {data} {
+itcl::body Rappture::Task::OnOutput {data} {
     if {[string length $_outputcb] > 0} {
         uplevel #0 $_outputcb [list $data]
@@ -461 +466 @@
         return 0
     }
-    set state [$_xmlobj get "tool.cached"]
+if 0 {
+    set state [$_xmlobj get "tool.cache"]
     if { $state == "" } {
         return 0
     }
+} else {
+    set state 1 
+}
     if { ![string is boolean $state] } {
         return 0
@@ -603 +612 @@
             -keepnewline yes \
             -killsignal  SIGTERM \
-            -onoutput    [list [itcl::code $this _output]] \
+            -onoutput    [list [itcl::code $this OnOutput]] \
             -output      [list [itcl::scope _job(stdout)]] \
             -error       [list [itcl::scope _job(stderr)]] \
             $cmd
     } result
-
+puts stderr "stderr=$_job(stderr) stdout=$_job(stdout)"
     # Step 4. Check the token and the exit code.
     set logmesg $result
@@ -642 +651 @@
         return 0;                       # Fail
     }
-    
+        if { $_uq(type) != "" } {
+            CollectUQResults
+        }
+    puts stderr "_job(stdout)=$_job(stdout) _job(stderr)=$_job(stderr)"
     # Step 5. Look in stdout for the name of the run file.
     set pattern {=RAPPTURE-RUN=>([^\n]+)}
@@ -839 +851 @@
     }
     # Get the session from runfile 
-    set session [$xmlobj get "tool.session"]
-    catch exec {submit --cache $session} result
+    set session [$xmlobj get "output.session"]
+    if { [catch {exec submit --cache $session} result] != 0 } {
+       puts stderr "submit --cache failed: $result"
+    }
     set _job(xmlobj) $xmlobj
 }
 
 
-itcl::body Rappture::Task::CheckCacheForRunFile { driverFile } {
+itcl::body Rappture::Task::CheckForCachedRunFile { driverFile } {
 
     # Read the driver file and collect its contents as the query.
@@ -880 +894 @@
     close $f
     set _job(runfile) $fileName
+    set _job(success) 1
+    set _job(stderr) "Loading cached results\n"
+    OnOutput "Loading cached results\n"
     return 1
 }
@@ -885 +902 @@
 # UQ. Collect data from all jobs and put it in one xml run file.
 itcl::body Rappture::Task::CollectUQResults {} {
+   puts stderr "CollectUQResult"
     file delete -force -- "run_uq.xml"
     global rapptureInfo
@@ -891 +909 @@
         exec puq analyze $puqFileName
     } fileName] != 0 } {
+   puts stderr "puq analyze failed: $fileName"
         set f [open "uq_debug.err" r]
         set rdata [read $f]
@@ -899 +918 @@
         set _job(runfile) $fileName
     }
-}
+   puts stderr "runfile=$_job(runfile)"
+}