retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Improve shutdown behavior by first soft cancelling all threads and waiting a while for them to exit. 

Based on a patch by Allan Sandfeld Jensen.


git-svn-id: http://yate.null.ro/svn/yate/trunk@3385 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-06-16 12:23:23 +00:00
parent 91ca986d14
commit a412a081e2
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engine/Thread.cpp
View File

@ -89,7 +89,7 @@ public:
using namespace TelEngine;
#define SOFT_KILLS 5
#define SOFT_WAITS 3
#define HARD_KILLS 5
#define KILL_WAIT 32
@ -428,13 +428,32 @@ void ThreadPrivate::killall()
Debugger debug("ThreadPrivate::killall()");
ThreadPrivate *t;
bool sledgehammer = false;
int c = 1;
s_tmutex.lock();
ObjList *l = &s_threads;
ObjList* l = &s_threads;
while (l && (t = static_cast<ThreadPrivate *>(l->get())) != 0)
{
Debug(DebugInfo,"Stopping ThreadPrivate '%s' [%p]",t->m_name,t);
t->cancel(false);
l = l->next();
}
int c;
for (int w = 0; w < SOFT_WAITS; w++) {
s_tmutex.unlock();
Thread::idle();
s_tmutex.lock();
c = s_threads.count();
if (!c) {
s_tmutex.unlock();
return;
}
}
Debug(DebugMild,"Hard cancelling %d remaining threads",c);
l = &s_threads;
c = 1;
while (l && (t = static_cast<ThreadPrivate *>(l->get())) != 0)
{
Debug(DebugInfo,"Trying to kill ThreadPrivate '%s' [%p], attempt %d",t->m_name,t,c);
bool ok = t->cancel(c > SOFT_KILLS);
bool ok = t->cancel(true);
if (ok) {
int d = 0;
// delay a little (exponentially) so threads have a chance to clean up
@ -466,7 +485,7 @@ void ThreadPrivate::killall()
continue;
}
Thread::msleep(1);
if (++c >= (SOFT_KILLS+HARD_KILLS)) {
if (++c >= HARD_KILLS) {
Debug(DebugGoOn,"Could not kill %p, will use sledgehammer later.",t);
sledgehammer = true;
t->m_thread = 0;