- Added Sycamore protocol and command context to SICS
- Added sinfo to SICS - Added driver for TCP/IP Astrium velocity selector - Added driver for TCP/IP Astrium chopper controller SKIPPED: psi/amor2t.c psi/amorstat.c psi/dornier2.c psi/ecb.c psi/el734hp.c psi/fowrite.c psi/libpsi.a psi/make_gen psi/nextrics.c psi/pardef.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/scontroller.c psi/serial.c psi/tasinit.c psi/tasscan.c psi/tcpdocho.c psi/tcpdornier.c psi/tricssupport.c psi/velodornier.c
This commit is contained in:
@ -38,7 +38,8 @@ proc mcstasdump {pid} {
|
||||
error "Trying to dump invalid PID: $pid"
|
||||
}
|
||||
clientput "Dumping ..."
|
||||
catch {eval exec /usr/bin/kill -USR2 $pid}
|
||||
# catch {eval exec /usr/bin/kill -USR2 $pid}
|
||||
catch {eval exec /bin/kill -USR2 $pid}
|
||||
wait $mcwaittime
|
||||
}
|
||||
#-----------------------------------------------------------------------
|
||||
@ -49,7 +50,9 @@ proc mcstasdump {pid} {
|
||||
# the Unix FAQ this is the best solution......
|
||||
#----------------------------------------------------------------------
|
||||
proc readPID {pid} {
|
||||
set f [ open "| /bin/ps -up $pid" r]
|
||||
# set f [ open "| /bin/ps -up $pid" r]
|
||||
# This is system dependent. The above works for SL, below for Suse
|
||||
set f [ open "| /bin/ps up $pid" r]
|
||||
set pstxt [read $f]
|
||||
close $f
|
||||
return $pstxt
|
||||
@ -57,12 +60,14 @@ proc readPID {pid} {
|
||||
#----------------------------------------------------------------------
|
||||
proc mcstasisrunning {pid} {
|
||||
global runningCount runningLast
|
||||
|
||||
|
||||
# clientput "Checking McStas PID $pid"
|
||||
if { $pid <= 0} {
|
||||
return 0
|
||||
}
|
||||
set pstxt " "
|
||||
set ret [catch {set pstxt [readPID $pid]} msg]
|
||||
# clientput "pstext = $pstxt"
|
||||
set pslist [split $pstxt "\n"]
|
||||
if { [llength $pslist] < 2} {
|
||||
return 0
|
||||
@ -84,13 +89,17 @@ proc mcstaskill {pid} {
|
||||
error "Trying to kill invalid PID $pid"
|
||||
}
|
||||
clientput "Killing $pid"
|
||||
catch {eval exec /usr/bin/kill -TERM $pid}
|
||||
# catch {eval exec /usr/bin/kill -TERM $pid} msg
|
||||
# On Suse kill is /bin/kill, on others it is /usr/bin/kill
|
||||
catch {eval exec /bin/kill -TERM $pid} msg
|
||||
clientput "Kill message $msg"
|
||||
# catch {mccontrol finish}
|
||||
wait 10
|
||||
}
|
||||
#-----------------------------------------------------------------------
|
||||
proc mcinstall {} {
|
||||
allowexec /usr/bin/kill
|
||||
allowexec /bin/kill
|
||||
allowexec /bin/ps
|
||||
Publish mcstasdump User
|
||||
Publish mcstasisrunning User
|
||||
|
Reference in New Issue
Block a user