diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-26 03:17:00 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-26 03:17:00 +0000 |
| commit | 7c03aa99f89e23d5076b4a705689fd37af176bcb (patch) | |
| tree | 9f01ac991c89b149df9128a59b69c0436f5d4634 /channels | |
| parent | ee779c29a0dd4450c736715920bfe84c8673dcfd (diff) | |
Fix agent deadlock
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1435 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_agent.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index ac92eb32c..c5181f9a4 100755 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -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; } |