[asterisk-commits] file: branch 1.2 r73349 - in /branches/1.2: apps/app_chanspy.c channel.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jul  5 09:19:14 2007
New Revision: 73349

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73349
Log:
Tweak spy locking. (issue #9951 reported by welles)

Modified:
    branches/1.2/apps/app_chanspy.c
    branches/1.2/channel.c

Modified: branches/1.2/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_chanspy.c?view=diff&rev=73349&r1=73348&r2=73349
==============================================================================
--- branches/1.2/apps/app_chanspy.c (original)
+++ branches/1.2/apps/app_chanspy.c Thu Jul  5 09:19:14 2007
@@ -329,9 +329,10 @@
 
 	ast_deactivate_generator(chan);
 	
+	csth.spy.status = CHANSPY_DONE;
+
 	ast_mutex_lock(&csth.spy.lock);
 	if (csth.spy.chan) {
-		csth.spy.status = CHANSPY_DONE;
 		ast_mutex_lock(&csth.spy.chan->lock);
 		ast_channel_spy_remove(csth.spy.chan, &csth.spy);
 		ast_mutex_unlock(&csth.spy.chan->lock);

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?view=diff&rev=73349&r1=73348&r2=73349
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Thu Jul  5 09:19:14 2007
@@ -1047,20 +1047,18 @@
 /* Detach a spy from it's channel */
 static void spy_detach(struct ast_channel_spy *spy, struct ast_channel *chan)
 {
-	ast_mutex_lock(&spy->lock);
-
 	/* We only need to poke them if they aren't already done */
 	if (spy->status != CHANSPY_DONE) {
+		ast_mutex_lock(&spy->lock);
 		spy->status = CHANSPY_STOP;
 		spy->chan = NULL;
 		if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE)
 			ast_cond_signal(&spy->trigger);
+		ast_mutex_unlock(&spy->lock);
 	}
 	
 	/* Print it out while we still have a lock so the structure can't go away (if signalled above) */
 	ast_log(LOG_DEBUG, "Spy %s removed from channel %s\n", spy->type, chan->name);
-
-	ast_mutex_unlock(&spy->lock);
 
 	return;
 }
@@ -1073,13 +1071,10 @@
 		return;
 
 	AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->spies->list, spy, list) {
-		ast_mutex_lock(&spy->lock);
 		if ((spy->type == type) && (spy->status == CHANSPY_RUNNING)) {
-			ast_mutex_unlock(&spy->lock);
 			AST_LIST_REMOVE_CURRENT(&chan->spies->list, list);
 			spy_detach(spy, chan);
-		} else
-			ast_mutex_unlock(&spy->lock);
+		}
 	}
 	AST_LIST_TRAVERSE_SAFE_END
 	spy_cleanup(chan);
@@ -1198,6 +1193,8 @@
 	trans = (dir == SPY_READ) ? &chan->spies->read_translator : &chan->spies->write_translator;
 
 	AST_LIST_TRAVERSE(&chan->spies->list, spy, list) {
+		if (spy->status != CHANSPY_RUNNING)
+			continue;
 		ast_mutex_lock(&spy->lock);
 
 		queue = (dir == SPY_READ) ? &spy->read_queue : &spy->write_queue;