afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes for errors with distributed sessions not using the Python Broker

Browse source 
(Boeing r1821)
This commit is contained in:
ahrenholz 2014-01-21 22:17:31 +00:00
parent de58978f2c
commit a69396d1d5
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gui/api.tcl
View file

@ -1274,6 +1274,13 @@ proc parseConfMessage { data len flags channel } {
# update the configuration for a node without displaying dialog box # update the configuration for a node without displaying dialog box
if { $tflags & 0x2 } { if { $tflags & 0x2 } {
if { $obj == "emane" && $node == "" } {
set node [lindex [findWlanNodes ""] 0]
}
if { $node == "" } {
puts "ignoring Configure message for $obj with no node"
return
}
# this is similar to popupCapabilityConfigApply # this is similar to popupCapabilityConfigApply
setCustomConfig $node $obj $types $values 0 setCustomConfig $node $obj $types $values 0
if { $obj != "emane" && [nodeType $node] == "wlan"} { if { $obj != "emane" && [nodeType $node] == "wlan"} {

12
gui/exec.tcl
View file

@ -499,7 +499,9 @@ proc monitor_loop {} {
set cpuusageforserver [lindex $cpuusage 0] set cpuusageforserver [lindex $cpuusage 0]
} else { } else {
set server [lindex $assigned_servers $i] set server [lindex $assigned_servers $i]
set ip [lindex $exec_servers($server) 0] set srv [array get exec_servers $server]
if { $srv == "" } { continue }
set ip [lindex $srv 0]
# TODO: receive CPU usage from other servers # TODO: receive CPU usage from other servers
set cpuusageforserver 0 set cpuusageforserver 0
} }
@ -765,7 +767,9 @@ proc manageCPUwindow {xpos ypos start} {
set ip [getMyIP] set ip [getMyIP]
} else { } else {
set server [lindex $assigned_servers $i] set server [lindex $assigned_servers $i]
set ip [lindex $exec_servers($server) 0] set srv [array get exec_servers $server]
if { $srv == "" } { continue }
set ip [lindex $srv 0]
} }
set server_cpuusage($ip) [lreplace $server_cpuusage($ip) 0 end] set server_cpuusage($ip) [lreplace $server_cpuusage($ip) 0 end]
} }
@ -811,7 +815,9 @@ proc plotCPUusage { } {
set ip [getMyIP] set ip [getMyIP]
} else { } else {
set server [lindex $assigned_servers $i] set server [lindex $assigned_servers $i]
set ip [lindex $exec_servers($server) 0] set srv [array get exec_servers $server]
if { $srv == "" } { continue }
set ip [lindex $srv 0]
} }
#need to add multiple cpuusgaehistory (array) #need to add multiple cpuusgaehistory (array)