preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-25 08:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

ThreadManager: Lock notify on global queue add.

Browse Source 
Otherwise, it's possible the chosen thread might not wake up, and then it
may wait for another task to be enqueued - potentially causing a hang.
This commit is contained in:
Unknown W. Brackets
2021-11-27 08:57:19 -08:00
parent d15af6e9d9
commit de9a4dcede
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/Thread/ThreadManager.cpp
+13 -5
View File
@@ -26,9 +26,10 @@ const int EXTRA_THREADS = 4; // For I/O limited tasks
struct GlobalThreadContext {
std::mutex mutex; // associated with each respective condition variable
std::deque<Task *> queue;
std::atomic<int> queue_size;
std::vector<ThreadContext *> threads_;
int roundRobin = 0;
std::atomic<int> roundRobin;
};
struct ThreadContext {
@@ -43,7 +44,8 @@ struct ThreadContext {
};
ThreadManager::ThreadManager() : global_(new GlobalThreadContext()) {
global_->queue_size = 0;
global_->roundRobin = 0;
}
ThreadManager::~ThreadManager() {
@@ -76,6 +78,7 @@ static void WorkerThreadFunc(GlobalThreadContext *global, ThreadContext *thread)
if (!global->queue.empty()) {
task = global->queue.front();
global->queue.pop_front();
global->queue_size--;
// We are processing one now, so mark that.
thread->queue_size++;
@@ -88,7 +91,7 @@ static void WorkerThreadFunc(GlobalThreadContext *global, ThreadContext *thread)
if (!thread->private_queue.empty()) {
task = thread->private_queue.front();
thread->private_queue.pop_front();
} else if (thread->private_single.load() == nullptr) {
} else if (thread->private_single.load() == nullptr && global->queue_size.load() == 0) {
thread->cond.wait(lock);
}
}
@@ -162,9 +165,14 @@ void ThreadManager::EnqueueTask(Task *task, TaskType taskType) {
{
std::unique_lock<std::mutex> lock(global_->mutex);
global_->queue.push_back(task);
global_->threads_[global_->roundRobin % maxThread]->cond.notify_one();
global_->roundRobin++;
global_->queue_size++;
}
// Lock the thread to ensure it gets the message.
int chosenIndex = global_->roundRobin++;
ThreadContext *&chosenThread = global_->threads_[chosenIndex % maxThread];
std::unique_lock<std::mutex> lock(chosenThread->mutex);
chosenThread->cond.notify_one();
}
void ThreadManager::EnqueueTaskOnThread(int threadNum, Task *task, TaskType taskType) {