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

Fixed a ThreadedSource destruction race found by maciejka. 

git-svn-id: http://voip.null.ro/svn/yate@658 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2006-01-20 17:54:25 +00:00
parent eb1e32102f
commit 4f85bac3b8
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
engine/DataFormat.cpp
View File

@ -28,19 +28,34 @@
namespace TelEngine {
static Mutex s_dataMutex(true);
static Mutex s_sourceMutex;
class ThreadedSourcePrivate : public Thread
{
friend class ThreadedSource;
public:
ThreadedSourcePrivate(ThreadedSource *source, const char *name, Thread::Priority prio)
ThreadedSourcePrivate(ThreadedSource* source, const char* name, Thread::Priority prio)
: Thread(name,prio), m_source(source) { }
protected:
virtual void run()
{ m_source->run(); }
{
m_source->run();
s_sourceMutex.lock();
ThreadedSource* source = m_source;
m_source = 0;
if (source) {
source->m_thread = 0;
source->cleanup();
}
s_sourceMutex.unlock();
}
virtual void cleanup()
{ m_source->m_thread = 0; m_source->cleanup(); }
{
if (m_source)
m_source->cleanup();
}
private:
ThreadedSource* m_source;
@ -576,15 +591,14 @@ bool ThreadedSource::start(const char* name, Thread::Priority prio)
void ThreadedSource::stop()
{
Lock lock(mutex());
if (m_thread) {
ThreadedSourcePrivate* tmp = m_thread;
m_thread = 0;
// we HAVE to destroy the thread with the mutex locked as we cannot
// allow the thread to die inside Forward() but we first try to get
// it run until it stucks against the mutex
Thread::yield();
s_sourceMutex.lock();
ThreadedSourcePrivate* tmp = m_thread;
m_thread = 0;
if (tmp) {
tmp->m_source = 0;
delete tmp;
}
s_sourceMutex.unlock();
}
void ThreadedSource::cleanup()