[cleanup] use std::optional for cConcurrentQueue::try_pop

maxr-dot-org · Aug 20, 2024 · ca8fed7 · ca8fed7
1 parent a2e17a0
commit ca8fed7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/src/lib/game/logic/client.cpp b/src/lib/game/logic/client.cpp
@@ -155,10 +155,9 @@ void cClient::runClientJobs()
 //------------------------------------------------------------------------------
 void cClient::handleNetMessages()
 {
-	std::unique_ptr<cNetMessage> message;
-	while (eventQueue.try_pop (message))
+	while (auto message = eventQueue.try_pop())
 	{
-		if (handleNetMessage (*message))
+		if (handleNetMessage (**message))
 		{
 			return;
 		}

diff --git a/src/lib/game/logic/server.cpp b/src/lib/game/logic/server.cpp
@@ -222,10 +222,9 @@ void cServer::run()
 {
 	while (!exit)
 	{
-		std::unique_ptr<cNetMessage> message;
-		while (eventQueue.try_pop (message))
+		while (const auto message = eventQueue.try_pop())
 		{
-			run (*message);
+			run (**message);
 		}
 
 		//TODO: gameinit: start timer, when all clients are ready

diff --git a/src/lib/game/startup/lobbyclient.cpp b/src/lib/game/startup/lobbyclient.cpp
@@ -60,9 +60,7 @@ void cLobbyClient::pushMessage (std::unique_ptr<cNetMessage> message)
 //------------------------------------------------------------------------------
 std::unique_ptr<cNetMessage> cLobbyClient::popMessage()
 {
-	std::unique_ptr<cNetMessage> message;
-	messageQueue.try_pop (message);
-	return message;
+	return messageQueue.try_pop().value_or (nullptr);
 }
 
 //------------------------------------------------------------------------------
@@ -73,10 +71,9 @@ void cLobbyClient::run()
 		client->run();
 		return;
 	}
-	std::unique_ptr<cNetMessage> message;
-	while (messageQueue.try_pop (message))
+	while (const auto message = messageQueue.try_pop())
 	{
-		handleNetMessage (*message);
+		handleNetMessage (**message);
 	}
 }
 

diff --git a/src/lib/game/startup/lobbyserver.cpp b/src/lib/game/startup/lobbyserver.cpp
@@ -67,9 +67,7 @@ void cLobbyServer::pushMessage (std::unique_ptr<cNetMessage> message)
 //------------------------------------------------------------------------------
 std::unique_ptr<cNetMessage> cLobbyServer::popMessage()
 {
-	std::unique_ptr<cNetMessage> message;
-	messageQueue.try_pop (message);
-	return message;
+	return messageQueue.try_pop().value_or (nullptr);
 }
 
 //------------------------------------------------------------------------------
@@ -136,11 +134,9 @@ eOpenServerResult cLobbyServer::startServer (int port)
 //------------------------------------------------------------------------------
 void cLobbyServer::run()
 {
-	std::unique_ptr<cNetMessage> message;
-
-	while (messageQueue.try_pop (message))
+	while (const auto message = messageQueue.try_pop())
 	{
-		handleNetMessage (*message);
+		handleNetMessage (**message);
 	}
 }
 

diff --git a/src/lib/utility/thread/concurrentqueue.h b/src/lib/utility/thread/concurrentqueue.h
@@ -22,6 +22,7 @@
 
 #include <deque>
 #include <mutex>
+#include <optional>
 
 template <typename T>
 class cConcurrentQueue
@@ -36,7 +37,7 @@ class cConcurrentQueue
 public:
 	void push (const T& value);
 	void push (T&& value);
-	bool try_pop (T& destination);
+	std::optional<T> try_pop();
 	void clear();
 
 	size_type safe_size() const;
@@ -67,16 +68,16 @@ void cConcurrentQueue<T>::push (T&& value)
 
 //------------------------------------------------------------------------------
 template <typename T>
-bool cConcurrentQueue<T>::try_pop (T& destination)
+std::optional<T> cConcurrentQueue<T>::try_pop()
 {
 	std::unique_lock<std::mutex> lock (mutex);
 
-	if (internalQueue.empty()) return false;
+	if (internalQueue.empty()) return std::nullopt;
 
-	destination = std::move (internalQueue.front());
+	auto res = std::move (internalQueue.front());
 	internalQueue.pop_front();
 
-	return true;
+	return res;
 }
 
 //------------------------------------------------------------------------------