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

Commited hard cancel fix submitted by Etoile Di�se. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@1023 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2006-09-10 14:21:32 +00:00
parent e6b81022c9
commit 6fc18d1cc2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/Thread.cpp
View File

@ -257,7 +257,7 @@ void ThreadPrivate::pubdestroy()
return;
Thread::msleep(5,false);
}
if (!cancel(true))
if (m_cancel && !cancel(true))
Debug(DebugWarn,"ThreadPrivate::pubdestroy() %p '%s' failed cancel [%p]",m_thread,m_name,this);
}
}
@ -303,6 +303,7 @@ bool ThreadPrivate::cancel(bool hard)
return true;
}
}
m_running = false;
#ifdef _WINDOWS
Debug(DebugGoOn,"ThreadPrivate terminating win32 thread %lu [%p]",thread,this);
ret = ::TerminateThread(reinterpret_cast<HANDLE>(thread),0) != 0;
@ -311,10 +312,12 @@ bool ThreadPrivate::cancel(bool hard)
ret = !::pthread_cancel(thread);
#endif
if (ret) {
m_running = false;
// hard cancel succeeded - object is unsafe to touch any more
Thread::msleep(1);
return true;
}
// hard cancel failed - set back the running flag
m_running = true;
}
m_cancel = true;
}