WorkQueueThread: provide name and function at same time

Source/Core/AudioCommon/CubebStream.cpp

@@ -39,7 +39,7 @@ void CubebStream::StateCallback(cubeb_stream* stream, void* user_data, cubeb_sta
 
 CubebStream::CubebStream()
 #ifdef _WIN32
-    : m_work_queue([](const std::function<void()>& func) { func(); })
+    : m_work_queue("Cubeb Worker", [](const std::function<void()>& func) { func(); })
 {
   Common::Event sync_event;
   m_work_queue.EmplaceItem([this, &sync_event] {

Source/Core/Common/WorkQueueThread.h

@@ -20,19 +20,20 @@ template <typename T>
 class WorkQueueThread
 {
 public:
-  WorkQueueThread(std::string name) : m_thread_name(name){};
+  WorkQueueThread() = default;
-  WorkQueueThread(std::function<void(T)> function, std::string name) : m_thread_name(name)
+  WorkQueueThread(const std::string name, std::function<void(T)> function)
   {
-    Reset(std::move(function));
+    Reset(std::move(name), std::move(function));
   }
   ~WorkQueueThread() { Shutdown(); }
 
   // Shuts the current work thread down (if any) and starts a new thread with the given function
   // Note: Some consumers of this API push items to the queue before starting the thread.
-  void Reset(std::function<void(T)> function)
+  void Reset(const std::string& name, std::function<void(T)> function)
   {
     Shutdown();
     std::lock_guard lg(m_lock);
+    m_thread_name = std::move(name);
     m_shutdown = false;
     m_function = std::move(function);
     m_thread = std::thread(&WorkQueueThread::ThreadLoop, this);

Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp

@@ -200,7 +200,7 @@ CEXIMic::CEXIMic(int index)
     : slot(index)
 #ifdef _WIN32
       ,
-      m_work_queue([](const std::function<void()>& func) { func(); }, "Mic Worker")
+      m_work_queue("Mic Worker", [](const std::function<void()>& func) { func(); })
 #endif
 {
   m_position = 0;

Source/Core/Core/HW/EXI/EXI_DeviceMic.h

@@ -102,7 +102,7 @@ private:
   int samples_avail;
 
 #ifdef _WIN32
-  Common::WorkQueueThread<std::function<void()>> m_work_queue{"Mic Worker"};
+  Common::WorkQueueThread<std::function<void()>> m_work_queue;
   bool m_coinit_success = false;
   bool m_should_couninit = false;
 #endif

Source/Core/Core/IOS/Network/IP/Top.cpp

@@ -65,7 +65,7 @@ enum SOResultCode : s32
 NetIPTopDevice::NetIPTopDevice(Kernel& ios, const std::string& device_name)
     : Device(ios, device_name)
 {
-  m_work_queue.Reset([this](AsyncTask task) {
+  m_work_queue.Reset("Network Worker", [this](AsyncTask task) {
     const IPCReply reply = task.handler();
     {
       std::lock_guard lg(m_async_reply_lock);

Source/Core/Core/IOS/Network/IP/Top.h

@@ -120,7 +120,7 @@ private:
   IPCReply HandleICMPPingRequest(const IOCtlVRequest& request);
 
   Common::SocketContext m_socket_context;
-  Common::WorkQueueThread<AsyncTask> m_work_queue{"Network Worker"};
+  Common::WorkQueueThread<AsyncTask> m_work_queue;
   std::mutex m_async_reply_lock;
   std::queue<AsyncReply> m_async_replies;
 };

Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp

@@ -150,7 +150,7 @@ s32 NWC24MakeUserID(u64* nwc24_id, u32 hollywood_id, u16 id_ctr, HardwareModel h
 NetKDRequestDevice::NetKDRequestDevice(Kernel& ios, const std::string& device_name)
     : Device(ios, device_name), config{ios.GetFS()}, m_dl_list{ios.GetFS()}
 {
-  m_work_queue.Reset([this](AsyncTask task) {
+  m_work_queue.Reset("WiiConnect24 Worker", [this](AsyncTask task) {
     const IPCReply reply = task.handler();
     {
       std::lock_guard lg(m_async_reply_lock);

Source/Core/Core/IOS/Network/KD/NetKDRequest.h

@@ -54,7 +54,7 @@ private:
 
   NWC24::NWC24Config config;
   NWC24::NWC24Dl m_dl_list;
-  Common::WorkQueueThread<AsyncTask> m_work_queue{"WiiConnect24 Worker"};
+  Common::WorkQueueThread<AsyncTask> m_work_queue;
   std::mutex m_async_reply_lock;
   std::queue<AsyncReply> m_async_replies;
   // TODO: Maybe move away from Common::HttpRequest?

Source/Core/Core/State.cpp

@@ -85,7 +85,7 @@ struct CompressAndDumpState_args
 static std::mutex s_save_thread_mutex;
 
 // Queue for compressing and writing savestates to disk.
-static Common::WorkQueueThread<CompressAndDumpState_args> s_save_thread("Savestate Worker");
+static Common::WorkQueueThread<CompressAndDumpState_args> s_save_thread;
 
 // Keeps track of savestate writes that are currently happening, so we don't load a state while
 // another one is still saving. This is particularly important so if you save to a slot and then
@@ -724,7 +724,7 @@ void Init()
   if (lzo_init() != LZO_E_OK)
     PanicAlertFmtT("Internal LZO Error - lzo_init() failed");
 
-  s_save_thread.Reset([](CompressAndDumpState_args args) {
+  s_save_thread.Reset("Savestate Worker", [](CompressAndDumpState_args args) {
     CompressAndDumpState(args);
 
     {

Source/Core/DolphinQt/GameList/GameTracker.cpp

@@ -55,7 +55,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
     m_load_thread.EmplaceItem(Command{CommandType::UpdateMetadata, {}});
   });
 
-  m_load_thread.Reset([this](Command command) {
+  m_load_thread.Reset("GameList Tracker", [this](Command command) {
     switch (command.type)
     {
     case CommandType::LoadCache:

Source/Core/DolphinQt/GameList/GameTracker.h

@@ -87,7 +87,7 @@ private:
   // game path -> directories that track it
   QMap<QString, QSet<QString>> m_tracked_files;
   QVector<QString> m_tracked_paths;
-  Common::WorkQueueThread<Command> m_load_thread{"GameList Tracker"};
+  Common::WorkQueueThread<Command> m_load_thread;
   UICommon::GameFileCache m_cache;
   Common::Event m_cache_loaded_event;
   Common::Event m_initial_games_emitted_event;