Changeset 5130 for branches/1.4/gui/scripts

Timestamp:

Mar 14, 2015, 12:46:48 AM (9 years ago)

Author:

ldelgass

Message:

Merge r4692 from trunk with modification: only print error message about
clobbered buffer if tracing is enabled.

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/visviewer.tcl (modified) (8 diffs)

branches/1.4/gui/scripts/visviewer.tcl

@@ -48 +48 @@
     protected variable _outbuf       ;    # buffer for outgoing commands
     protected variable _buffering 0
+    protected variable _cmdSeq 0     ;    # Command sequence number
     protected variable _dispatcher "";  # dispatcher for !events
     protected variable _hosts ""    ;   # list of hosts for server
@@ -322 +323 @@
     set _buffer(in) ""
     set _outbuf ""
+    set _cmdSeq 0
 }
 
@@ -402 +404 @@
     puts -nonewline $_sid $_buffer(out)
     flush $_sid
+    set _buffer(out) ""
     set _done($this) 1;                 # Success
 }
@@ -455 +458 @@
     # before sending anything.
     set _done($this) 1
+    if {$_trace && $_buffer(out) != ""} {
+        puts stderr "ERROR: re-entered SendBytes: buffer=([string range $_buffer(out) 0 70]...)"
+        puts stderr "New cmd $_cmdSeq: [string range $bytes 0 70]..."
+    }
     set _buffer(out) $bytes
     # There's problem when the user is interacting with the GUI at the
@@ -564 +571 @@
     if { [string compare -length 3 $line "nv>"] == 0 } {
         ReceiveEcho <<line $line
+        if ($_trace) {
+            puts stderr "<<[string range $line 0 70]"
+        }
         append _buffer(in) [string range $line 3 end]
         append _buffer(in) "\n"
@@ -826 +836 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VisViewer::SendDebugCommand {} {
+    incr _cmdSeq
     set cmd [$itk_component(command) get]
     append cmd "\n"
+    if {$_trace} {
+        puts stderr "$_cmdSeq>>[string range $cmd 0 70]"
+    }
     SendBytes $cmd
     $itk_component(command) delete 0 end
@@ -1193 +1207 @@
 #
 itcl::body Rappture::VisViewer::SendCmd {string} {
+    incr _cmdSeq
+    if {$_trace} {
+        puts stderr "$_cmdSeq>>[string range $string 0 70]"
+    }
     if { $_buffering } {
         append _outbuf $string "\n"
@@ -1210 +1228 @@
         puts stderr "$_cmdSeq>>data payload"
     }
+    incr _cmdSeq
+    if {$_trace} {
+        puts stderr "$_cmdSeq>>[string range $string 0 70]"
+    }
     if { $_buffering } {
         append _outbuf $bytes