kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-05-04 04:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of all that old needlock garbage now that we're using recursive mutexes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-06 22:17:32 +00:00
parent d0037ea2fd
commit 13bca43aa8
40 changed files with 226 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_local.c
View File

@@ -112,7 +112,7 @@ retrylock:
ast_mutex_lock(&p->lock);
goto retrylock;
}
ast_queue_frame(other, f, 0);
ast_queue_frame(other, f);
ast_mutex_unlock(&other->lock);
p->glaredetect = 0;
return 0;
@@ -185,23 +185,20 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f)
return res;
}
static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock)
static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{
struct local_pvt *p = newchan->pvt->pvt;
if (needlock)
ast_mutex_lock(&p->lock);
ast_mutex_lock(&p->lock);
if ((p->owner != oldchan) && (p->chan != oldchan)) {
ast_log(LOG_WARNING, "old channel wasn't %p but was %p/%p\n", oldchan, p->owner, p->chan);
if (needlock)
ast_mutex_unlock(&p->lock);
ast_mutex_unlock(&p->lock);
return -1;
}
if (p->owner == oldchan)
p->owner = newchan;
else
p->chan = newchan;
if (needlock)
ast_mutex_unlock(&p->lock);
ast_mutex_unlock(&p->lock);
return 0;
}