Changeset 2303

Timestamp:

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

Author:

chris

Message:

Additional debugging for protocol stream deadlock reported by
Matt Brown.

Location:

box/trunk/lib/server

Files:

• Protocol.cpp (modified) (4 diffs)
• ProtocolUncertainStream.cpp (modified) (6 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)

box/trunk/lib/server/ProtocolUncertainStream.cpp

@@ -78 +78 @@
                         }
                         
+                        BOX_TRACE("Reading " << toRead << " bytes from stream");
+        
                         // Read it
                         int r = mrSource.Read(((uint8_t*)pBuffer) + read, toRead, Timeout);
@@ -83 +85 @@
                         if(r == 0)
                         {
+                                BOX_TRACE("Read " << r << " bytes from "
+                                        "stream, returning");
                                 return read;
                         }
@@ -93 +97 @@
                         if(r != toRead)
                         {
+                                BOX_TRACE("Read " << r << " bytes from "
+                                        "stream, returning");
                                 return read;
                         }
@@ -103 +109 @@
                         {
                                 // Didn't get the byte, return now
+                                BOX_TRACE("Read 0 bytes of block header, "
+                                        "returning with " << read << " bytes "
+                                        "read this time");
                                 return read;
                         }
@@ -111 +120 @@
                                 // All done.
                                 mFinished = true;
+                                BOX_TRACE("Stream finished, returning with " <<
+                                        read << " bytes read this time");
                                 return read;
                         }
@@ -128 +139 @@
                                 THROW_EXCEPTION(ServerException, ProtocolUncertainStreamBadBlockHeader) 
                         }
+
+                        BOX_TRACE("Next block has " <<
+                                mBytesLeftInCurrentBlock << "bytes");
                 }
         }