Changeset 6112


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.5

    • Property svn:mergeinfo changed
      /trunkmerged: 6111
  • branches/1.5/lang/tcl/scripts/task.tcl

    r5984 r6112  
    1919
    2020itcl::class Rappture::Task {
    21     private method GetSignal { signal }
    22 
    2321    public variable logger ""
    2422    public variable jobstats Rappture::Task::MiddlewareTime
     
    4240    protected method _build_submit_cmd {cmd tfile params_file}
    4341    protected method _get_params {varlist uq_type uq_args}
     42    private method GetSignal { signal }
    4443
    4544    private variable _xmlobj ""      ;# XML object with inputs/outputs
     
    123122itcl::body Rappture::Task::GetSignal {code} {
    124123    set signals {
    125         HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV
    126         USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN
    127         TTOU URG XCPU XFSZ VTALRM PROF WINCH POLL PWR SYS
    128         RTMIN RTMIN+1 RTMIN+2 RTMIN+3 RTMAX-3 RTMAX-2 RTMAX-1 RTMAX
     124        HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV
     125        USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN
     126        TTOU URG XCPU XFSZ VTALRM PROF WINCH POLL PWR SYS
     127        RTMIN RTMIN+1 RTMIN+2 RTMIN+3 RTMAX-3 RTMAX-2 RTMAX-1 RTMAX
    129128    }
    130129    set sigNum [expr $code - 128]
    131130    if { $sigNum > 0 && $sigNum < [llength $signals] } {
    132         return [lindex $signals $sigNum]
     131        return [lindex $signals $sigNum]
    133132    }
    134133    return "unknown exit code \"$code\""
     
    309308                       # invalid result from the program.  Append the stderr
    310309                       # from the program to the message.
    311                        if {$code > 128} {
    312                           set logmesg "Program signaled: signal was [GetSignal]"
     310                       if {$code > 128} {
     311                          set logmesg "Program signaled: signal was [GetSignal $code]"
    313312                       } else {
    314313                          set logmesg "Program finished: exit code is $code"
     
    672671itcl::body Rappture::Task::_get_params {varlist uq_type uq_args} {
    673672    set pid [pid]
    674     # puts "get_params.py $pid $varlist $uq_type $uq_args"
     673    # puts "puq get_params $pid $varlist $uq_type $uq_args"
    675674    if {[catch {exec puq get_params $pid $varlist $uq_type $uq_args}]} {
    676675        set fp [open "uq_debug.err" r]
Note: See TracChangeset for help on using the changeset viewer.