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

Use separate mutexes to protect the owner CallEndpoint pointer since using DataEndpoint::commonMutex() from the data threads can lead to deadlocks. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6188 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2017-02-22 11:19:08 +00:00
parent 0734faa2b6
commit bcdf0ab849
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/wavefile.cpp
View File

@ -127,7 +127,9 @@ private:
AttachHandler* m_handler; AttachHandler* m_handler;
}; };
Mutex s_mutex(false,"WaveFile"); Mutex s_statsMutex(false,"WaveFile::stats");
Mutex s_srcMutex(false,"WaveFile::src");
Mutex s_consMutex(false,"WaveFile::cons");
int s_reading = 0; int s_reading = 0;
int s_writing = 0; int s_writing = 0;
bool s_dataPadding = true; bool s_dataPadding = true;
@ -268,9 +270,9 @@ WaveSource::WaveSource(const char* file, CallEndpoint* chan, bool autoclose)
m_nodata(false) m_nodata(false)
{ {
Debug(&__plugin,DebugAll,"WaveSource::WaveSource(\"%s\",%p) [%p]",file,chan,this); Debug(&__plugin,DebugAll,"WaveSource::WaveSource(\"%s\",%p) [%p]",file,chan,this);
s_mutex.lock(); s_statsMutex.lock();
s_reading++; s_reading++;
s_mutex.unlock(); s_statsMutex.unlock();
} }
WaveSource::~WaveSource() WaveSource::~WaveSource()
@ -286,9 +288,9 @@ WaveSource::~WaveSource()
} }
delete m_stream; delete m_stream;
m_stream = 0; m_stream = 0;
s_mutex.lock(); s_statsMutex.lock();
s_reading--; s_reading--;
s_mutex.unlock(); s_statsMutex.unlock();
} }
void WaveSource::detectAuFormat() void WaveSource::detectAuFormat()
@ -454,10 +456,10 @@ void WaveSource::cleanup()
{ {
RefPointer<CallEndpoint> chan; RefPointer<CallEndpoint> chan;
if (m_chan) { if (m_chan) {
DataEndpoint::commonMutex().lock(); s_srcMutex.lock();
chan = m_chan; chan = m_chan;
m_chan = 0; m_chan = 0;
DataEndpoint::commonMutex().unlock(); s_srcMutex.unlock();
} }
Debug(&__plugin,DebugAll,"WaveSource cleanup, total=%u, chan=%p [%p]", Debug(&__plugin,DebugAll,"WaveSource cleanup, total=%u, chan=%p [%p]",
m_total,(void*)chan,this); m_total,(void*)chan,this);
@ -485,11 +487,11 @@ void WaveSource::notify(WaveSource* source, const char* reason)
{ {
RefPointer<CallEndpoint> chan; RefPointer<CallEndpoint> chan;
if (m_chan) { if (m_chan) {
DataEndpoint::commonMutex().lock(); s_srcMutex.lock();
if (source) if (source)
chan = m_chan; chan = m_chan;
m_chan = 0; m_chan = 0;
DataEndpoint::commonMutex().unlock(); s_srcMutex.unlock();
} }
if (!chan) { if (!chan) {
if (m_id) { if (m_id) {
@ -519,9 +521,9 @@ WaveConsumer::WaveConsumer(const String& file, CallEndpoint* chan, unsigned maxl
{ {
Debug(&__plugin,DebugAll,"WaveConsumer::WaveConsumer(\"%s\",%p,%u,\"%s\",%s,%p) [%p]", Debug(&__plugin,DebugAll,"WaveConsumer::WaveConsumer(\"%s\",%p,%u,\"%s\",%s,%p) [%p]",
file.c_str(),chan,maxlen,format,String::boolText(append),param,this); file.c_str(),chan,maxlen,format,String::boolText(append),param,this);
s_mutex.lock(); s_statsMutex.lock();
s_writing++; s_writing++;
s_mutex.unlock(); s_statsMutex.unlock();
if (format) { if (format) {
m_locked = true; m_locked = true;
m_format = format; m_format = format;
@ -610,9 +612,9 @@ WaveConsumer::~WaveConsumer()
} }
delete m_stream; delete m_stream;
m_stream = 0; m_stream = 0;
s_mutex.lock(); s_statsMutex.lock();
s_writing--; s_writing--;
s_mutex.unlock(); s_statsMutex.unlock();
} }
void WaveConsumer::writeIlbcHeader() const void WaveConsumer::writeIlbcHeader() const
@ -727,10 +729,10 @@ unsigned long WaveConsumer::Consume(const DataBlock& data, unsigned long tStamp,
m_stream = 0; m_stream = 0;
RefPointer<CallEndpoint> chan; RefPointer<CallEndpoint> chan;
if (m_chan) { if (m_chan) {
DataEndpoint::commonMutex().lock(); s_consMutex.lock();
chan = m_chan; chan = m_chan;
m_chan = 0; m_chan = 0;
DataEndpoint::commonMutex().unlock(); s_consMutex.unlock();
} }
if (chan) { if (chan) {
DDebug(&__plugin,DebugInfo,"Preparing 'maxlen' disconnector for '%s' chan %p '%s' in consumer [%p]", DDebug(&__plugin,DebugInfo,"Preparing 'maxlen' disconnector for '%s' chan %p '%s' in consumer [%p]",