Changes related to debugging an issue.

It may not have had as much to do with low-level protocol details, and a
lot of this can be reverted, but I can't revert it right now.  I'll look
it over later in the week.

1 files changed, 32 insertions, 0 deletions

diff --git a/src/stable/client.cpp b/src/stable/client.cpp
index ca86f37..43ae83b 100644
--- a/src/stable/client.cpp
+++ b/src/stable/client.cpp
@@ -25,11 +25,13 @@ Bu::Client::Client( Bu::TcpSocket *pSocket,
     bWantsDisconnect( false ),
     pfLink( pfLink )
 {
+    Bu::ReadWriteMutex::WriteLocker lGlobal( mGlobal );
     lFilts.prepend( pSocket );
 }
 
 Bu::Client::~Client()
 {
+    Bu::ReadWriteMutex::WriteLocker lGlobal( mGlobal );
     for( FilterList::iterator i = lFilts.begin(); i; i++ )
     {
         delete *i;
@@ -40,6 +42,7 @@ Bu::Client::~Client()
 
 void Bu::Client::processInput()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     mRead.lock();
     char buf[RBS];
     Bu::size nRead, nTotal=0;
@@ -85,6 +88,7 @@ void Bu::Client::processInput()
 
 void Bu::Client::processOutput()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     mWrite.lock();
     char buf[RBS];
     if( qbWrite.getSize() > 0 )
@@ -100,17 +104,20 @@ void Bu::Client::processOutput()
 
 void Bu::Client::setProtocol( Protocol *pProto )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     this->pProto = pProto;
     this->pProto->onNewConnection( this );
 }
 
 Bu::Protocol *Bu::Client::getProtocol()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     return pProto;
 }
 
 void Bu::Client::clearProtocol()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     pProto = NULL;
 }
 /*
@@ -127,127 +134,149 @@ Bu::String &Bu::Client::getOutput()
 
 bool Bu::Client::isOpen()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     if( !pTopStream ) return false;
     return pTopStream->isOpen();
 }
 
 Bu::size Bu::Client::write( const Bu::String &sData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( sData.getStr(), sData.getSize() );
 }
 
 Bu::size Bu::Client::write( const void *pData, Bu::size nBytes )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( pData, nBytes );
 }
 
 Bu::size Bu::Client::write( int8_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( int16_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( int32_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( int64_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( uint8_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( uint16_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( uint32_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::write( uint64_t nData )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.write( (const char *)&nData, sizeof(nData) );
 }
 
 Bu::size Bu::Client::read( void *pData, Bu::size nBytes )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbRead.read( pData, nBytes );
 }
 
 Bu::size Bu::Client::peek( void *pData, int nBytes, int nOffset )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbRead.peek( pData, nBytes, nOffset );
 }
 
 Bu::size Bu::Client::getInputSize()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbRead.getSize();
 }
 
 Bu::size Bu::Client::getOutputSize()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mWrite );
     return qbWrite.getSize();
 }
 
 const Bu::TcpSocket *Bu::Client::getSocket() const
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     return pSocket;
 }
 
 void Bu::Client::disconnect()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     bWantsDisconnect = true;
 }
 
 bool Bu::Client::wantsDisconnect()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     return bWantsDisconnect;
 }
 
 void Bu::Client::close()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     pTopStream->close();
 }
 
 Bu::ClientLink *Bu::Client::getLink()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     return pfLink->createLink( this );
 }
 
 void Bu::Client::onMessage( const Bu::String &sMsg )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     if( pProto )
         pProto->onMessage( this, sMsg );
 }
 
 void Bu::Client::tick()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     if( pProto )
         pProto->onTick( this );
 }
@@ -259,6 +288,7 @@ Bu::size Bu::Client::tell()
 
 void Bu::Client::seek( Bu::size offset )
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mRead );
     return qbRead.seek( offset );
 }
@@ -280,11 +310,13 @@ bool Bu::Client::isEos()
 
 void Bu::Client::flush()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     processOutput();
 }
 
 bool Bu::Client::canRead()
 {
+    Bu::ReadWriteMutex::ReadLocker lGlobal( mGlobal );
     Bu::MutexLocker l( mRead );
     return qbRead.getSize() > 0;
 }