Changeset 6039

Timestamp:

Feb 22, 2016 11:40:36 AM (8 years ago)

Author:

ldelgass

Message:

merge r5982 from 1.4 branch (report signal in task)

Location:

trunk

Files:

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

trunk/lang/tcl/scripts/task.tcl

@@ -40 +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
@@ -117 +118 @@
     }
     return ""
+}
+
+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
+    }
+    set sigNum [expr $code - 128]
+    if { $sigNum > 0 && $sigNum < [llength $signals] } {
+        return [lindex $signals $sigNum]
+    }
+    return "unknown exit code \"$code\""
 }
 
@@ -292 +307 @@
                        # invalid result from the program.  Append the stderr
                        # from the program to the message.
-                       set logmesg "Program finished: exit code is $code"
+                       if {$code > 128} {
+                          set logmesg "Program signaled: signal was [GetSignal]"
+                       } else {
+                          set logmesg "Program finished: exit code is $code"
+                       }
                        set result "$logmesg\n\n$::Rappture::Task::job(error)"
                     } elseif { $token == "abort" }  {