mirrors/TarsCloud_TarsCpp
1
0
Fork 0
mirror of https://gitee.com/TarsCloud/TarsCpp.git synced 2024-12-22 22:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: threadpool waitForAllDone not quit bug

Browse Source
This commit is contained in:
ruanshudong 2022-10-26 21:22:58 +08:00
parent 019b0c914c
commit 487cf89a5a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/src/tc_thread_pool.cpp
View File

@ -155,17 +155,17 @@ bool TC_ThreadPool::waitForAllDone(int millsecond)
{
std::unique_lock<std::mutex> lock(_mutex);
if (_tasks.empty())
if (_tasks.empty() && _atomic == 0)
return true;
if (millsecond < 0)
{
_condition.wait(lock, [this] { return _tasks.empty(); });
_condition.wait(lock, [this] { return _tasks.empty() && _atomic == 0; });
return true;
}
else
{
return _condition.wait_for(lock, std::chrono::milliseconds(millsecond), [this] { return _tasks.empty(); });
return _condition.wait_for(lock, std::chrono::milliseconds(millsecond), [this] { return _tasks.empty() && _atomic == 0; });
}
}