aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-03 18:25:23 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-08-03 18:25:23 +0000
commit595be2ae22fb16ff6abfc7f25430b4386b9f3996 (patch)
treeb70c2af5d763d146ead302fc63cc950ba4f893d2
parentdc15c855f43521854edac330ca55cea27295c4b9 (diff)
Remove queue/session co-locking until deadlocks are properly resolved
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6273 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xapps/app_queue.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index f8f7a7461..8de4beedf 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -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 )
{
char *a[] = { "show", "queues" };
- ast_mutex_lock(&s->lock);
queues_show(s->fd, 2, a);
ast_cli(s->fd, "\r\n\r\n"); /* Properly terminate Manager output */
- ast_mutex_unlock(&s->lock);
return RESULT_SUCCESS;
}
@@ -3326,7 +3324,6 @@ static int manager_queues_status( struct mansession *s, struct message *m )
if (!ast_strlen_zero(id)) {
snprintf(idText,256,"ActionID: %s\r\n",id);
}
- ast_mutex_lock(&s->lock);
for (q = queues; q; q = q->next) {
ast_mutex_lock(&q->lock);
@@ -3393,7 +3390,6 @@ static int manager_queues_status( struct mansession *s, struct message *m )
"%s"
"\r\n",idText);
- ast_mutex_unlock(&s->lock);
return RESULT_SUCCESS;
}