gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

CHECK => ASSERT for WorkerThread::IsRunning()

Browse source
This commit is contained in:
Alex Zolotarev 2015-06-01 21:43:46 +03:00
parent ab0a54023f
commit 1e1328f85b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/worker_thread.hpp
View file

@ -27,7 +27,7 @@ public:
ASSERT(m_threadChecker.CalledOnOriginalThread(), ());
if (IsRunning())
RunUntilIdleAndStop();
CHECK(!IsRunning(), ());
ASSERT(!IsRunning(), ());
}
/// Pushes new task into worker thread's queue. If the queue is
@ -37,7 +37,7 @@ public:
void Push(shared_ptr<Task> task)
{
ASSERT(m_threadChecker.CalledOnOriginalThread(), ());
CHECK(IsRunning(), ());
ASSERT(IsRunning(), ());
unique_lock<mutex> lock(m_mutex);
m_condNotFull.wait(lock, [this]()
{
@ -52,7 +52,7 @@ public:
void RunUntilIdleAndStop()
{
ASSERT(m_threadChecker.CalledOnOriginalThread(), ());
CHECK(IsRunning(), ());
ASSERT(IsRunning(), ());
{
lock_guard<mutex> lock(m_mutex);
m_shouldFinish = true;