From 005ba43a662dc8840b5817498ecc5db271aef6fc Mon Sep 17 00:00:00 2001 From: "ahrenholz@gmail.com" Date: Tue, 21 Jan 2014 22:17:31 +0000 Subject: [PATCH] fixes for errors with distributed sessions not using the Python Broker (Boeing r1821) --- trunk/gui/api.tcl | 7 +++++++ trunk/gui/exec.tcl | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/trunk/gui/api.tcl b/trunk/gui/api.tcl index 308e83f1..42813736 100755 --- a/trunk/gui/api.tcl +++ b/trunk/gui/api.tcl @@ -1274,6 +1274,13 @@ proc parseConfMessage { data len flags channel } { # update the configuration for a node without displaying dialog box 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 setCustomConfig $node $obj $types $values 0 if { $obj != "emane" && [nodeType $node] == "wlan"} { diff --git a/trunk/gui/exec.tcl b/trunk/gui/exec.tcl index 22799c46..0fe7a63e 100755 --- a/trunk/gui/exec.tcl +++ b/trunk/gui/exec.tcl @@ -499,7 +499,9 @@ proc monitor_loop {} { set cpuusageforserver [lindex $cpuusage 0] } else { 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 set cpuusageforserver 0 } @@ -765,7 +767,9 @@ proc manageCPUwindow {xpos ypos start} { set ip [getMyIP] } else { 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] } @@ -811,7 +815,9 @@ proc plotCPUusage { } { set ip [getMyIP] } else { 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)