kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 42133 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42133 | bweschke | 2006-09-06 14:16:41 -0400 (Wed, 06 Sep 2006) | 6 lines

 Look ma! No more deadlocks! <sic>

 As posted from #7458 and others similar to it in Mantis:
 p->app_lock was a mutex really designed for use with agents not in callback mode. That being the case, I've tried to code it so that when callback mode is used, the app_lock mutex will not be locked/unlocked at all. Please let me know how you make out - and if you continue to deadlock now, please reproduce the deadlock logging information and post to Mantis. 


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
BJ Weschke
2006-09-20 03:51:01 +00:00
parent 02868b1723
commit e8606d9c57
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_agent.c
View File

@@ -815,6 +815,7 @@ static int agent_hangup(struct ast_channel *ast)
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
} }
/* Release ownership of the agent to other threads (presumably running the login app). */ /* Release ownership of the agent to other threads (presumably running the login app). */
if (ast_strlen_zero(p->loginchan))
ast_mutex_unlock(&p->app_lock); ast_mutex_unlock(&p->app_lock);
} }
return 0; return 0;
@@ -955,7 +956,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
* implemented in the kernel for this. * implemented in the kernel for this.
*/ */
p->app_sleep_cond = 0; p->app_sleep_cond = 0;
if(ast_mutex_trylock(&p->app_lock)) { if(ast_strlen_zero(p->loginchan) && ast_mutex_trylock(&p->app_lock)) {
if (p->chan) { if (p->chan) {
ast_queue_frame(p->chan, &ast_null_frame); ast_queue_frame(p->chan, &ast_null_frame);
ast_mutex_unlock(&p->lock); /* For other thread to read the condition. */ ast_mutex_unlock(&p->lock); /* For other thread to read the condition. */
@@ -971,7 +972,20 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
ast_mutex_unlock(&p->app_lock); ast_mutex_unlock(&p->app_lock);
return NULL; return NULL;
} }
} else if (!ast_strlen_zero(p->loginchan)) {
if (p->chan)
ast_queue_frame(p->chan, &ast_null_frame);
if (!p->chan) {
ast_log(LOG_WARNING, "Agent disconnected while we were connecting the call\n");
p->owner = NULL;
tmp->tech_pvt = NULL;
p->app_sleep_cond = 1;
ast_channel_free( tmp );
ast_mutex_unlock(&p->lock); /* For other thread to read the condition. */
return NULL;
} }
}
ast_indicate(p->chan, AST_CONTROL_UNHOLD);
p->owning_app = pthread_self(); p->owning_app = pthread_self();
/* After the above step, there should not be any blockers. */ /* After the above step, there should not be any blockers. */
if (p->chan) { if (p->chan) {
@@ -979,7 +993,6 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" ); ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" );
CRASH; CRASH;
} }
ast_indicate(p->chan, AST_CONTROL_UNHOLD);
} }
return tmp; return tmp;
} }