ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review feedback

This commit is contained in:
Scott Mansell 2023-02-04 16:42:50 +13:00
parent 7c4fcc30a3
commit 9c012b09b3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Common/WorkQueueThread.h
View File

@ -8,6 +8,7 @@
#include <functional> #include <functional>
#include <queue> #include <queue>
#include <string> #include <string>
#include <string_view>
#include <thread> #include <thread>
#include "Common/Thread.h" #include "Common/Thread.h"
@ -21,19 +22,19 @@ class WorkQueueThread
{ {
public: public:
WorkQueueThread() = default; WorkQueueThread() = default;
WorkQueueThread(const std::string name, std::function<void(T)> function) WorkQueueThread(const std::string_view name, std::function<void(T)> function)
{ {
Reset(std::move(name), std::move(function)); Reset(name, std::move(function));
} }
~WorkQueueThread() { Shutdown(); } ~WorkQueueThread() { Shutdown(); }
// Shuts the current work thread down (if any) and starts a new thread with the given function // 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. // Note: Some consumers of this API push items to the queue before starting the thread.
void Reset(const std::string& name, std::function<void(T)> function) void Reset(const std::string_view name, std::function<void(T)> function)
{ {
Shutdown(); Shutdown();
std::lock_guard lg(m_lock); std::lock_guard lg(m_lock);
m_thread_name = std::move(name); m_thread_name = name;
m_shutdown = false; m_shutdown = false;
m_function = std::move(function); m_function = std::move(function);
m_thread = std::thread(&WorkQueueThread::ThreadLoop, this); m_thread = std::thread(&WorkQueueThread::ThreadLoop, this);
@ -59,7 +60,7 @@ public:
if (m_shutdown) if (m_shutdown)
return; return;
m_items.push(item); m_items.push(std::move(item));
m_idle = false; m_idle = false;
m_worker_cond_var.notify_one(); m_worker_cond_var.notify_one();
} }
@ -122,7 +123,7 @@ public:
m_wait_cond_var.wait(lg, [&] { return m_idle; }); m_wait_cond_var.wait(lg, [&] { return m_idle; });
} }
// For the worker to check if it should abort it's work early. // If the worker polls IsCanceling(), it can abort its work when Cancelling
bool IsCancelling() const { return m_cancelling.load(); } bool IsCancelling() const { return m_cancelling.load(); }
private: private: