ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add bool return to stopThread

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-04 18:06:58 -07:00
parent fd14957072
commit c8837d07e7
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/beast_core/threads/beast_Thread.cpp
View File

@@ -171,8 +171,10 @@ bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const
return true;
}
void Thread::stopThread (const int timeOutMilliseconds)
bool Thread::stopThread (const int timeOutMilliseconds)
{
bool cleanExit = true;
// agh! You can't stop the thread that's calling this method! How on earth
// would that work??
bassert (getCurrentThreadId() != getThreadId());
@@ -185,21 +187,30 @@ void Thread::stopThread (const int timeOutMilliseconds)
notify();
if (timeOutMilliseconds != 0)
waitForThreadToExit (timeOutMilliseconds);
{
cleanExit = waitForThreadToExit (timeOutMilliseconds);
}
if (isThreadRunning())
{
bassert (! cleanExit);
// very bad karma if this point is reached, as there are bound to be
// locks and events left in silly states when a thread is killed by force..
bassertfalse;
Logger::writeToLog ("!! killing thread by force !!");
killThread();
threadHandle = nullptr;
threadId = 0;
cleanExit = false;
}
else
{
cleanExit = true;
}
}
return cleanExit;
}
//==============================================================================