Changeset 10756

Timestamp:

02/12/10 20:26:50 (2 years ago)

Author:

submersible_toaster

Message:

make the incremental json parsing less broken when reading from wxsocket

File:

• trunk/Padre-Plugin-Swarm/lib/Padre/Plugin/Swarm/Transport/Global/WxSocket.pm (modified) (1 diff)

trunk/Padre-Plugin-Swarm/lib/Padre/Plugin/Swarm/Transport/Global/WxSocket.pm

@@ -152 +152 @@
     my $marshal = $self->marshal;
     
-    my @messages;
     my $data = '';
+    my $buffer;
     # Read chunks of data from the socket until there is
     # no more to read, feeding it into the decoder.
     # TODO - can we yield to WxIdle in here? .. safely?
-    while ( $sock->Read( $data, 1024, length($data)  ) ) {
-        my @m = eval { $marshal->incr_parse($data) };
-        if ($@) {
+    while ( $sock->Read( $data, 1024, 0  ) ) {
+        $buffer .= $data;
+        $data='';
+    }
+    eval { $marshal->incr_parse($buffer) }; # VOID context pls!!
+    TRACE( "Pumped $buffer from socket" ) if DEBUG;
+    my @messages;
+    push @messages , eval { $marshal->incr_parse() };
+    if ($@) {
             TRACE( "Unparsable message - $@" ) if DEBUG;
-            $marshal->incr_skip;
-        } else {
-            push @messages ,@m if @m;
-        }
-        $data='';
+            #$marshal->incr_skip;
     }