TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

task: fix mutex recursion when task awaiting other task ends

Browse Source
This commit is contained in:
rdb 2019-01-09 22:12:02 +01:00
parent e64a342a9f
commit d1845530aa
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/event/asyncTaskChain.cxx
View File

@ -788,18 +788,17 @@ cleanup_task(AsyncTask *task, bool upon_death, bool clean_exit) {
_manager->remove_task_by_name(task); _manager->remove_task_by_name(task);
if (upon_death && task->set_future_state(clean_exit ? AsyncFuture::FS_finished if (upon_death) {
_manager->_lock.unlock();
if (task->set_future_state(clean_exit ? AsyncFuture::FS_finished
: AsyncFuture::FS_cancelled)) { : AsyncFuture::FS_cancelled)) {
task->notify_done(clean_exit); task->notify_done(clean_exit);
} }
task->_manager = nullptr;
if (upon_death) {
_manager->_lock.unlock();
task->upon_death(_manager, clean_exit); task->upon_death(_manager, clean_exit);
_manager->_lock.lock(); _manager->_lock.lock();
} }
task->_manager = nullptr;
} }
/** /**