From 4095dc1815f82e9e0b61948958a268f86278206d Mon Sep 17 00:00:00 2001 From: file Date: Tue, 5 Sep 2006 20:02:48 +0000 Subject: Merge in last round of spy fixes. This should hopefully eliminate all the issues people have been seeing by distinctly separating what each component (core/spy) is responsible for. Core is responsible for adding a spy to a channel, feeding frames to the spy, removing the spy from a channel, and telling the spy to stop. Spy is responsible for reading frames in, and cleaning up after itself. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@42054 f38db490-d61c-443f-a65b-d21fe96a405b --- channel.c | 111 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 40 deletions(-) (limited to 'channel.c') diff --git a/channel.c b/channel.c index 5a751fca3..327334390 100644 --- a/channel.c +++ b/channel.c @@ -1017,22 +1017,59 @@ int ast_channel_spy_add(struct ast_channel *chan, struct ast_channel_spy *spy) return 0; } +/* Clean up a channel's spy information */ +static void spy_cleanup(struct ast_channel *chan) +{ + if (AST_LIST_EMPTY(&chan->spies->list)) + return; + if (chan->spies->read_translator.path) + ast_translator_free_path(chan->spies->read_translator.path); + if (chan->spies->write_translator.path) + ast_translator_free_path(chan->spies->write_translator.path); + free(chan->spies); + chan->spies = NULL; + return; +} + +/* 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) { + spy->status = CHANSPY_STOP; + spy->chan = NULL; + if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) + ast_cond_signal(&spy->trigger); + } + + /* 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; +} + void ast_channel_spy_stop_by_type(struct ast_channel *chan, const char *type) { - struct ast_channel_spy *spy; + struct ast_channel_spy *spy = NULL; if (!chan->spies) return; - AST_LIST_TRAVERSE(&chan->spies->list, spy, list) { + AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->spies->list, spy, list) { ast_mutex_lock(&spy->lock); if ((spy->type == type) && (spy->status == CHANSPY_RUNNING)) { - spy->status = CHANSPY_STOP; - if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) - ast_cond_signal(&spy->trigger); - } - ast_mutex_unlock(&spy->lock); + 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); } void ast_channel_spy_trigger_wait(struct ast_channel_spy *spy) @@ -1049,65 +1086,59 @@ void ast_channel_spy_trigger_wait(struct ast_channel_spy *spy) void ast_channel_spy_remove(struct ast_channel *chan, struct ast_channel_spy *spy) { - struct ast_frame *f; - if (!chan->spies) return; AST_LIST_REMOVE(&chan->spies->list, spy, list); - ast_mutex_lock(&spy->lock); + spy_detach(spy, chan); + spy_cleanup(chan); +} - spy->chan = NULL; +void ast_channel_spy_free(struct ast_channel_spy *spy) +{ + struct ast_frame *f = NULL; - for (f = spy->read_queue.head; f; f = spy->read_queue.head) { - spy->read_queue.head = f->next; - ast_frfree(f); - } + if (spy->status == CHANSPY_DONE) + return; + + /* Switch status to done in case we get called twice */ + spy->status = CHANSPY_DONE; + + /* Drop any frames in the queue */ for (f = spy->write_queue.head; f; f = spy->write_queue.head) { spy->write_queue.head = f->next; ast_frfree(f); } + for (f = spy->read_queue.head; f; f= spy->read_queue.head) { + spy->read_queue.head = f->next; + ast_frfree(f); + } + /* Destroy the condition if in use */ if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) ast_cond_destroy(&spy->trigger); - ast_mutex_unlock(&spy->lock); - - ast_log(LOG_DEBUG, "Spy %s removed from channel %s\n", - spy->type, chan->name); + /* Destroy our mutex since it is no longer in use */ + ast_mutex_destroy(&spy->lock); - if (AST_LIST_EMPTY(&chan->spies->list)) { - if (chan->spies->read_translator.path) - ast_translator_free_path(chan->spies->read_translator.path); - if (chan->spies->write_translator.path) - ast_translator_free_path(chan->spies->write_translator.path); - free(chan->spies); - chan->spies = NULL; - } + return; } static void detach_spies(struct ast_channel *chan) { - struct ast_channel_spy *spy; + struct ast_channel_spy *spy = NULL; if (!chan->spies) return; - /* Marking the spies as done is sufficient. Chanspy or spy users will get the picture. */ - AST_LIST_TRAVERSE(&chan->spies->list, spy, list) { - ast_mutex_lock(&spy->lock); - spy->chan = NULL; - if (spy->status == CHANSPY_RUNNING) - spy->status = CHANSPY_DONE; - if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) - ast_cond_signal(&spy->trigger); - ast_mutex_unlock(&spy->lock); + AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->spies->list, spy, list) { + AST_LIST_REMOVE_CURRENT(&chan->spies->list, list); + spy_detach(spy, chan); } + AST_LIST_TRAVERSE_SAFE_END - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->spies->list, spy, list) - ast_channel_spy_remove(chan, spy); - AST_LIST_TRAVERSE_SAFE_END; + spy_cleanup(chan); } /*--- ast_softhangup_nolock: Softly hangup a channel, don't lock */ -- cgit v1.2.3