From 364ded646ad4de2065cdf0a2f4282c7eaf7148e6 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Wed, 18 Jul 2012 06:45:17 +0000
Subject: Bu::SynchroQueue had a bug, it seems to be all fixed now.

---
 src/stable/synchroqueue.h | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'src/stable')

diff --git a/src/stable/synchroqueue.h b/src/stable/synchroqueue.h
index a0335f6..7ba299f 100644
--- a/src/stable/synchroqueue.h
+++ b/src/stable/synchroqueue.h
@@ -56,6 +56,7 @@ namespace Bu
 		 */
 		~SynchroQueue()
 		{
+			cBlock.lock();
 			Item *pCur = pStart;
 			while( pCur )
 			{
@@ -63,6 +64,7 @@ namespace Bu
 				delete pCur;
 				pCur = pTmp;
 			}
+			cBlock.unlock();
 		}
 
 		/**
@@ -74,7 +76,7 @@ namespace Bu
 		 */
 		void enqueue( T pData )
 		{
-			mOperate.lock();
+			cBlock.lock();
 
 			if( pStart == NULL )
 			{
@@ -93,8 +95,8 @@ namespace Bu
 			}
 
 			cBlock.signal();
-		
-			mOperate.unlock();
+
+			cBlock.unlock();
 		}
 
 		/**
@@ -117,17 +119,20 @@ namespace Bu
 		 */
 		T dequeue( bool bBlock=false )
 		{
-			mOperate.lock();
+			cBlock.lock();
 			if( pStart == NULL )
 			{
-				mOperate.unlock();
-
 				if( bBlock )
 				{
-					cBlock.lock();
-
-					while( pStart == NULL )
+					for(;;)
+					{
+						if( pStart != NULL )
+						{
+							cBlock.unlock();
+							break;
+						}
 						cBlock.wait();
+					}
 				
 					T tmp = dequeue( false );
 					
@@ -146,7 +151,7 @@ namespace Bu
 				delete pDel;
 				nSize--;
 			
-				mOperate.unlock();
+				cBlock.unlock();
 				return pTmp;
 			}
 		}
@@ -164,13 +169,9 @@ namespace Bu
 		 */
 		T dequeue( int nSec, int nUSec )
 		{
-			mOperate.lock();
+			cBlock.lock();
 			if( pStart == NULL )
 			{
-				mOperate.unlock();
-
-				cBlock.lock();
-				
 				cBlock.wait( nSec, nUSec );
 
 				if( pStart == NULL )
@@ -179,13 +180,11 @@ namespace Bu
 					return NULL;
 				}
 			
-				mOperate.lock();
 				T pTmp = pStart->pData;
 				Item *pDel = pStart;
 				pStart = pStart->pNext;
 				delete pDel;
 				nSize--;
-				mOperate.unlock();
 					
 				cBlock.unlock();
 				return pTmp;
@@ -198,7 +197,7 @@ namespace Bu
 				delete pDel;
 				nSize--;
 			
-				mOperate.unlock();
+				cBlock.unlock();
 				return pTmp;
 			}
 		}
@@ -211,18 +210,18 @@ namespace Bu
 		 */
 		bool isEmpty()
 		{
-			mOperate.lock();
+			cBlock.lock();
 			bool bEmpty = (pStart == NULL );
-			mOperate.unlock();
+			cBlock.unlock();
 
 			return bEmpty;
 		}
 
 		long getSize()
 		{
-			mOperate.lock();
+			cBlock.lock();
 			long nRet = nSize;
-			mOperate.unlock();
+			cBlock.unlock();
 
 			return nRet;
 		}
@@ -232,7 +231,6 @@ namespace Bu
 		Item *pEnd;		/**< The end of the queue, the last element to dequeue. */
 		long nSize;		/**< The number of items in the queue. */
 
-		Mutex mOperate;	/**< The master mutex, used on all operations. */
 		Condition cBlock;	/**< The condition for blocking dequeues. */
 	};
 }
-- 
cgit v1.2.3