Changeset 2303 for box/trunk/lib/server/Protocol.cpp

Timestamp:

30/09/2008 22:07:36 (4 years ago)

Author:

chris

Message:

Additional debugging for protocol stream deadlock reported by
Matt Brown.

File:

• box/trunk/lib/server/Protocol.cpp (modified) (4 diffs)

box/trunk/lib/server/Protocol.cpp

@@ -750 +750 @@
                         
                         // Send final byte to finish the stream
+                        BOX_TRACE("Sending end of stream byte");
                         uint8_t endOfStream = ProtocolStreamHeader_EndOfStream;
                         mrStream.Write(&endOfStream, 1);
+                        BOX_TRACE("Sent end of stream byte");
                 }
                 catch(...)
@@ -789 +791 @@
         if(BytesInBlock == 0)
         {
+                BOX_TRACE("Zero size block, not sending anything");
                 return 0;
         }
@@ -814 +817 @@
         }
         ASSERT(header > 0);
+        BOX_TRACE("Sending header byte " << header << " plus " << writeSize <<
+                " bytes to stream");
         
         // Store the header
@@ -821 +826 @@
         mrStream.Write(Block - 1, writeSize + 1);
         
+        BOX_TRACE("Sent " << (writeSize+1) << " bytes to stream");
         // move the remainer to the beginning of the block for the next time round
         if(writeSize != BytesInBlock)