Changeset 6112 for branches/1.5/lang/tcl/scripts/task.tcl

Timestamp:

Mar 9, 2016 11:55:22 PM (7 years ago)

Author:

ldelgass

Message:

merge r6111 from trunk (GetSignal? needs argument)

Location:

branches/1.5

Files:

• . (modified) (1 prop)
• lang/tcl/scripts/task.tcl (modified) (5 diffs)

branches/1.5/lang/tcl/scripts/task.tcl

@@ -19 +19 @@
 
 itcl::class Rappture::Task {
-    private method GetSignal { signal }
-
     public variable logger ""
     public variable jobstats Rappture::Task::MiddlewareTime
@@ -42 +40 @@
     protected method _build_submit_cmd {cmd tfile params_file}
     protected method _get_params {varlist uq_type uq_args}
+    private method GetSignal { signal }
 
     private variable _xmlobj ""      ;# XML object with inputs/outputs
@@ -123 +122 @@
 itcl::body Rappture::Task::GetSignal {code} {
     set signals {
-        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 
-        RTMIN RTMIN+1 RTMIN+2 RTMIN+3 RTMAX-3 RTMAX-2 RTMAX-1 RTMAX
+        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 
+        RTMIN RTMIN+1 RTMIN+2 RTMIN+3 RTMAX-3 RTMAX-2 RTMAX-1 RTMAX
     }
     set sigNum [expr $code - 128]
     if { $sigNum > 0 && $sigNum < [llength $signals] } {
-        return [lindex $signals $sigNum]
+        return [lindex $signals $sigNum]
     }
     return "unknown exit code \"$code\""
@@ -309 +308 @@
                        # invalid result from the program.  Append the stderr
                        # from the program to the message.
-                       if {$code > 128} {
-                          set logmesg "Program signaled: signal was [GetSignal]"
+                       if {$code > 128} {
+                          set logmesg "Program signaled: signal was [GetSignal $code]"
                        } else { 
                           set logmesg "Program finished: exit code is $code"
@@ -672 +671 @@
 itcl::body Rappture::Task::_get_params {varlist uq_type uq_args} {
     set pid [pid]
-    # puts "get_params.py $pid $varlist $uq_type $uq_args"
+    # puts "puq get_params $pid $varlist $uq_type $uq_args"
     if {[catch {exec puq get_params $pid $varlist $uq_type $uq_args}]} {
         set fp [open "uq_debug.err" r]