dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix agent deadlock 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1435 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2003-08-26 03:17:00 +00:00
parent ee779c29a0
commit 7c03aa99f8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_agent.c
View File

@ -539,7 +539,6 @@ static int agent_cont_sleep( void *data )
static int agent_ack_sleep( void *data )
{
struct agent_pvt *p;
struct timeval tv;
int res;
int to = 1000;
@ -814,7 +813,7 @@ static int check_availability(struct agent_pvt *newlyavailable, int needlock)
static int check_beep(struct agent_pvt *newlyavailable, int needlock)
{
struct agent_pvt *p;
int res;
int res=0;
ast_log(LOG_DEBUG, "Checking beep availability of '%s'\n", newlyavailable->agent);
if (needlock)
ast_mutex_lock(&agentlock);
@ -836,6 +835,7 @@ static int check_beep(struct agent_pvt *newlyavailable, int needlock)
if (needlock)
ast_mutex_unlock(&agentlock);
if (p) {
ast_mutex_unlock(&p->lock);
ast_log( LOG_DEBUG, "Playing beep, lang '%s'\n", newlyavailable->chan->language);
res = ast_streamfile(newlyavailable->chan, "beep", newlyavailable->chan->language);
ast_log( LOG_DEBUG, "Played beep, result '%d'\n", res);
@ -843,6 +843,7 @@ static int check_beep(struct agent_pvt *newlyavailable, int needlock)
res = ast_waitstream(newlyavailable->chan, "");
ast_log( LOG_DEBUG, "Waited for stream, result '%d'\n", res);
}
ast_mutex_lock(&p->lock);
}
return res;
}