[Asterisk-cvs] asterisk/apps app_queue.c,1.155,1.156

[markster]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv26569/apps

Modified Files:
	app_queue.c 
Log Message:
Remove queue/session co-locking until deadlocks are properly resolved


Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- app_queue.c	31 Jul 2005 22:07:58 -0000	1.155
+++ app_queue.c	3 Aug 2005 18:25:23 -0000	1.156
@@ -3298,10 +3298,8 @@
 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 @@
 	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 @@
 		"%s"
 		"\r\n",idText);
 
-	ast_mutex_unlock(&s->lock);
 
 	return RESULT_SUCCESS;
 }