mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-13 21:39:05 +00:00
Remove queue/session co-locking until deadlocks are properly resolved
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3298,10 +3298,8 @@ static char *complete_queue(char *line, char *word, int pos, int state)
|
|||||||
static int manager_queues_show( struct mansession *s, struct message *m )
|
static int manager_queues_show( struct mansession *s, struct message *m )
|
||||||
{
|
{
|
||||||
char *a[] = { "show", "queues" };
|
char *a[] = { "show", "queues" };
|
||||||
ast_mutex_lock(&s->lock);
|
|
||||||
queues_show(s->fd, 2, a);
|
queues_show(s->fd, 2, a);
|
||||||
ast_cli(s->fd, "\r\n\r\n"); /* Properly terminate Manager output */
|
ast_cli(s->fd, "\r\n\r\n"); /* Properly terminate Manager output */
|
||||||
ast_mutex_unlock(&s->lock);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
@@ -3326,7 +3324,6 @@ static int manager_queues_status( struct mansession *s, struct message *m )
|
|||||||
if (!ast_strlen_zero(id)) {
|
if (!ast_strlen_zero(id)) {
|
||||||
snprintf(idText,256,"ActionID: %s\r\n",id);
|
snprintf(idText,256,"ActionID: %s\r\n",id);
|
||||||
}
|
}
|
||||||
ast_mutex_lock(&s->lock);
|
|
||||||
for (q = queues; q; q = q->next) {
|
for (q = queues; q; q = q->next) {
|
||||||
ast_mutex_lock(&q->lock);
|
ast_mutex_lock(&q->lock);
|
||||||
|
|
||||||
@@ -3393,7 +3390,6 @@ static int manager_queues_status( struct mansession *s, struct message *m )
|
|||||||
"%s"
|
"%s"
|
||||||
"\r\n",idText);
|
"\r\n",idText);
|
||||||
|
|
||||||
ast_mutex_unlock(&s->lock);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user