godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90809 from RandomShaper/fixup_wtp_yield

Browse Source 
WorkerThreadPool: Polish yielding (fix corner case, remove misleading warning)
This commit is contained in:
Rémi Verschelde 2024-04-17 20:26:46 +02:00
commit 26d8ae0849
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/object/worker_thread_pool.cpp
View File

@ -491,12 +491,10 @@ void WorkerThreadPool::notify_yield_over(TaskID p_task_id) {
ERR_FAIL_MSG("Invalid Task ID."); ERR_FAIL_MSG("Invalid Task ID.");
} }
Task *task = *taskp; Task *task = *taskp;
if (task->completed) {
#ifdef DEBUG_ENABLED task_mutex.unlock();
if (task->pool_thread_index == get_thread_index()) { return;
WARN_PRINT("A worker thread is attempting to notify itself. That makes no sense.");
} }
#endif
ThreadData &td = threads[task->pool_thread_index]; ThreadData &td = threads[task->pool_thread_index];
td.yield_is_over = true; td.yield_is_over = true;