Check the queue before waiting for new items

hawku · Jan 25, 2019 · d53eb54 · d53eb54 · GexorHD · Oct 14, 2020
1 parent b6ae971
commit d53eb54
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/TabletDriverService/BufferQueue.cpp b/TabletDriverService/BufferQueue.cpp
@@ -53,7 +53,17 @@ void BufferQueue::Clear()
 void BufferQueue::Wait()
 {
 	std::unique_lock<std::mutex> mlock(lockWait);
-	conditionBuffer.wait(mlock);
+
+	// Check if the queue is empty
+	bool isQueueEmpty = false;
+	lockQueue.lock();
+	isQueueEmpty = queue.empty();
+	lockQueue.unlock();
+
+	// Wait for items if queue is empty
+	if (isQueueEmpty) {
+		conditionBuffer.wait(mlock);
+	}
 }
 
 //

diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
@@ -281,7 +281,17 @@ void Logger::NotifyNewItem()
 void Logger::WaitNewItem()
 {
 	std::unique_lock<std::mutex> mlock(lockNewItem);
-	conditionNewItem.wait(mlock);
+
+	// Check if the queue is empty
+	bool isQueueEmpty = false;
+	lockQueue.lock();
+	isQueueEmpty = logQueue.empty();
+	lockQueue.unlock();
+
+	// Wait for items if queue is empty
+	if (isQueueEmpty) {
+		conditionNewItem.wait(mlock);
+	}
 }
 
 
@@ -292,15 +302,14 @@ void Logger::run() {
 
 	while (true) {
 
+		// Shutdown the thread
+		if (!IsRunning()) break;
+
 		// Wait for the new item
 		WaitNewItem();
 
 		// Process item queue
 		ProcessQueue();
-
-		// Shutdown the thread
-		if (!IsRunning()) break;
-
 	}
 
 	printf("Logger thread exit!\n");