kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully the last round of removing needlock stuff

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-04-08 19:28:05 +00:00
parent 1b2dc7ef75
commit e9c65d0c08
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_agent.c
View File

@@ -383,16 +383,14 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f)
static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{ {
struct agent_pvt *p = newchan->pvt->pvt; struct agent_pvt *p = newchan->pvt->pvt;
if (needlock) ast_mutex_lock(&p->lock);
ast_mutex_lock(&p->lock);
if (p->owner != oldchan) { if (p->owner != oldchan) {
ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner); ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
return -1; return -1;
} }
p->owner = newchan; p->owner = newchan;
if (needlock) ast_mutex_unlock(&p->lock);
ast_mutex_unlock(&p->lock);
return 0; return 0;
} }

6
channels/chan_h323.c
View File

@@ -626,15 +626,13 @@ static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{ {
struct oh323_pvt *p = newchan->pvt->pvt; struct oh323_pvt *p = newchan->pvt->pvt;
if (needlock) ast_mutex_lock(&p->lock);
ast_mutex_lock(&p->lock);
if (p->owner != oldchan) { if (p->owner != oldchan) {
ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner); ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
return -1; return -1;
} }
p->owner = newchan; p->owner = newchan;
if (needlock) ast_mutex_unlock(&p->lock);
ast_mutex_unlock(&p->lock);
return 0; return 0;
} }