automatically add thread name prefix

Author: hyperblast

cpp/server/deadbeef/player_misc.cpp

@@ -68,7 +68,7 @@ ColumnsQueryPtr PlayerImpl::createColumnsQuery(const std::vector<std::string>& c
 
 std::unique_ptr<WorkQueue> PlayerImpl::createWorkQueue()
 {
-    return std::make_unique<ThreadWorkQueue>(MSRV_THREAD_NAME(MSRV_PROJECT_ID "-control"));
+    return std::make_unique<ThreadWorkQueue>(MSRV_THREAD_NAME("control"));
 }
 
 void PlayerImpl::connect()

cpp/server/server_host.cpp

@@ -17,7 +17,7 @@
 namespace msrv {
 
 ServerHost::ServerHost(Player* player)
-    : player_(player), utilityQueue_(8, MSRV_THREAD_NAME(MSRV_PROJECT_ID "-io"))
+    : player_(player), utilityQueue_(8, MSRV_THREAD_NAME("io"))
 {
     playerWorkQueue_ = player_->createWorkQueue();
     player_->onEvents([this](PlayerEvents event) { handlePlayerEvents(event); });

cpp/server/server_thread.cpp

@@ -11,7 +11,7 @@ ServerThread::ServerThread(ServerReadyCallback readyCallback)
       readyCallback_(std::move(readyCallback))
 {
     thread_ = std::thread([this] {
-        setThreadName(MSRV_THREAD_NAME(MSRV_PROJECT_ID "-server"));
+        setThreadName(MSRV_THREAD_NAME("server"));
         run();
     });
 }

cpp/server/system.hpp

@@ -92,7 +92,7 @@ class Handle
 
 #if MSRV_OS_POSIX
 
-#define MSRV_THREAD_NAME(s) s
+#define MSRV_THREAD_NAME(s) MSRV_PROJECT_ID s
 
 typedef const char* ThreadName;
 
@@ -134,8 +134,9 @@ inline ErrorCode lastSystemError() noexcept
 
 #if MSRV_OS_WINDOWS
 
-#define MSRV_THREAD_NAME_(s) L ## s
-#define MSRV_THREAD_NAME(s) MSRV_THREAD_NAME_(s)
+#define MSRV_THREAD_NAME__(s) L ## s
+#define MSRV_THREAD_NAME_(s) MSRV_THREAD_NAME__(s)
+#define MSRV_THREAD_NAME(s) MSRV_THREAD_NAME_(MSRV_PROJECT_ID "-" s)
 
 typedef const wchar_t* ThreadName;