kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 73355 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2007-07-05 14:22:58 +00:00
parent 92de3e5939
commit f4943f3211
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_chanspy.c
View File

@@ -425,9 +425,10 @@ static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int
else else
ast_deactivate_generator(chan); 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 a channel still exists on our spy structure then we need to remove ourselves */
if (csth.spy.chan) { if (csth.spy.chan) {
csth.spy.status = CHANSPY_DONE;
ast_channel_lock(csth.spy.chan); ast_channel_lock(csth.spy.chan);
ast_channel_spy_remove(csth.spy.chan, &csth.spy); ast_channel_spy_remove(csth.spy.chan, &csth.spy);
ast_channel_unlock(csth.spy.chan); ast_channel_unlock(csth.spy.chan);

14
main/channel.c
View File

@@ -1347,23 +1347,21 @@ static void spy_cleanup(struct ast_channel *chan)
/* Detach a spy from it's channel */ /* Detach a spy from it's channel */
static void spy_detach(struct ast_channel_spy *spy, struct ast_channel *chan) 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 */ /* We only need to poke them if they aren't already done */
if (spy->status != CHANSPY_DONE) { if (spy->status != CHANSPY_DONE) {
ast_mutex_lock(&spy->lock);
/* Indicate to the spy to stop */ /* Indicate to the spy to stop */
spy->status = CHANSPY_STOP; spy->status = CHANSPY_STOP;
spy->chan = NULL; spy->chan = NULL;
/* Poke the spy if needed */ /* Poke the spy if needed */
if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE)
ast_cond_signal(&spy->trigger); 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) */ /* 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_debug(1, "Spy %s removed from channel %s\n", spy->type, chan->name);
ast_mutex_unlock(&spy->lock);
return; return;
} }
@@ -1375,13 +1373,10 @@ void ast_channel_spy_stop_by_type(struct ast_channel *chan, const char *type)
return; return;
AST_LIST_TRAVERSE_SAFE_BEGIN(&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)) { if ((spy->type == type) && (spy->status == CHANSPY_RUNNING)) {
ast_mutex_unlock(&spy->lock);
AST_LIST_REMOVE_CURRENT(&chan->spies->list, list); AST_LIST_REMOVE_CURRENT(&chan->spies->list, list);
spy_detach(spy, chan); spy_detach(spy, chan);
} else }
ast_mutex_unlock(&spy->lock);
} }
AST_LIST_TRAVERSE_SAFE_END AST_LIST_TRAVERSE_SAFE_END
spy_cleanup(chan); 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_channel_spy_queue *queue;
struct ast_frame *duped_fr; struct ast_frame *duped_fr;
if (spy->status != CHANSPY_RUNNING)
continue;
ast_mutex_lock(&spy->lock); ast_mutex_lock(&spy->lock);
queue = (dir == SPY_READ) ? &spy->read_queue : &spy->write_queue; queue = (dir == SPY_READ) ? &spy->read_queue : &spy->write_queue;