factor out a common function

src/common/ConcurrentQueue.h

@@ -21,6 +21,24 @@
 template<class T>
 class ConcurrentQueue
 {
+	private:
+
+	inline bool do_pop(T* res)
+	{
+		lock.lock();
+		*res = queue.front();
+		queue.pop();
+		poppedCount++;
+		count--;
+		lock.unlock();
+
+		pushSemaphore.post();
+
+		DPRINTF_DEBUG( "(%s) element popped", ownerName.c_str());
+
+		return true;
+	}
+
 	public:
 		/**
 		 * default queue size
@@ -75,76 +93,33 @@ class ConcurrentQueue
 
 		inline bool pop(T* res)
 		{
-			DPRINTF_DEBUG( "(%s) trying to pop element (%d elements in queue)",
-					(ownerName.empty() ? "<owner not set>" : ownerName.c_str()),
-					maxEntries-pushSemaphore.getCount());
 			if (!popSemaphore.wait()) {
 				return false;
 			}
-
-			lock.lock();
-			*res = queue.front();
-			queue.pop();
-			poppedCount++;
-			count--;
-			lock.unlock();
-
-			pushSemaphore.post();
-
-			DPRINTF_DEBUG( "(%s) element popped", ownerName.c_str());
-
-			return true;
+			return do_pop(res);
 		};
 
 		// try to pop an entry from the queue before timeout occurs
 		// if successful, res will hold the popped entry and true will be returned
 		// of the timeout has been reached, res will be set to NULL and false will be returned
 		inline bool pop(long timeout_ms, T *res)
 		{
-			// try to get an item from the queue
 			if(!popSemaphore.wait(timeout_ms)) {
-				// timeout occured
 				return false;
 			}
-
-			// popSemaphore.wait() succeeded, now pop the frontmost element
-			lock.lock();
-			*res = queue.front();
-			queue.pop();
-			poppedCount++;
-			count--;
-			lock.unlock();
-
-			pushSemaphore.post();
-
-			DPRINTF_DEBUG( "(%s) element popped", ownerName.c_str());
-
-			return true;
+			return do_pop(res);
 		}
 
 		// like pop above, but with absolute time instead of delta.
 		// use this instead of the above, makes things easier!
 		inline bool popAbs(const struct timespec& timeout, T *res)
 		{
 			if (popSemaphore.waitAbs(timeout)) {
-				// popSemaphore.wait() succeeded, now pop the frontmost element
-				lock.lock();
-				*res = queue.front();
-				queue.pop();
-				poppedCount++;
-				count--;
-				lock.unlock();
-
-				pushSemaphore.post();
-
-				DPRINTF_DEBUG( "(%s) element popped", ownerName.c_str());
-
-				return true;
+				return do_pop(res);
 			}
 			else {
 				// timeout occured
 				*res = 0;
-
 				return false;
 			}
 		}