Merged revisions 73355 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73355 | file | 2007-07-05 11:21:44 -0300 (Thu, 05 Jul 2007) | 10 lines

Merged revisions 73349 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73349 | file | 2007-07-05 11:19:14 -0300 (Thu, 05 Jul 2007) | 2 lines

Tweak spy locking. (issue #9951 reported by welles)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73359 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index f306314509d84432c36f08e8f53a759171ba2a4a..8081fb1d8935654f72ad2e0dc1a1ccaac0b7e48b 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -425,9 +425,10 @@ static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int
        else
                ast_deactivate_generator(chan);
 
+       csth.spy.status = CHANSPY_DONE;
+
        /* If a channel still exists on our spy structure then we need to remove ourselves */
        if (csth.spy.chan) {
-               csth.spy.status = CHANSPY_DONE;
                ast_channel_lock(csth.spy.chan);
                ast_channel_spy_remove(csth.spy.chan, &csth.spy);
                ast_channel_unlock(csth.spy.chan);

diff --git a/main/channel.c b/main/channel.c
index 5626e34f5846c26c309f60881d9e72f7b0e3f158..a39a3ad135c036669ad25a5359044a2ce6025f0d 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1347,23 +1347,21 @@ static void spy_cleanup(struct ast_channel *chan)
 /* 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);
                /* Indicate to the spy to stop */
                spy->status = CHANSPY_STOP;
                spy->chan = NULL;
                /* Poke the spy if needed */
                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_debug(1, "Spy %s removed from channel %s\n", spy->type, chan->name);
 
-       ast_mutex_unlock(&spy->lock);
-
        return;
 }
 
@@ -1375,13 +1373,10 @@ void ast_channel_spy_stop_by_type(struct ast_channel *chan, const char *type)
                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);
@@ -1493,6 +1488,9 @@ static void queue_frame_to_spies(struct ast_channel *chan, struct ast_frame *f,
                struct ast_channel_spy_queue *queue;
                struct ast_frame *duped_fr;
 
+               if (spy->status != CHANSPY_RUNNING)
+                       continue;
+
                ast_mutex_lock(&spy->lock);
 
                queue = (dir == SPY_READ) ? &spy->read_queue : &spy->write_queue;