diff options
| -rw-r--r-- | channels/chan_local.c | 37 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 5 | ||||
| -rw-r--r-- | main/channel.c | 15 |
3 files changed, 35 insertions, 22 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index cbf7f7f48..3795be9c6 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -154,8 +154,6 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra { struct ast_channel *other = NULL; -retrylock: - /* Recalculate outbound channel */ other = isoutbound ? p->owner : p->chan; @@ -173,27 +171,28 @@ retrylock: ast_clear_flag(p, LOCAL_GLARE_DETECT); return 0; } - if (ast_mutex_trylock(&other->lock)) { - /* Failed to lock. Release main lock and try again */ - ast_mutex_unlock(&p->lock); - if (us) { - if (ast_mutex_unlock(&us->lock)) { - ast_log(LOG_WARNING, "%s wasn't locked while sending %d/%d\n", - us->name, f->frametype, f->subclass); - us = NULL; - } + + ast_mutex_unlock(&p->lock); + + /* Ensure that we have both channels locked */ + if (us) { + while (ast_channel_trylock(other)) { + ast_channel_unlock(us); + usleep(1); + ast_channel_lock(us); } - /* Wait just a bit */ - usleep(1); - /* Only we can destroy ourselves, so we can't disappear here */ - if (us) - ast_mutex_lock(&us->lock); - ast_mutex_lock(&p->lock); - goto retrylock; + } else { + ast_channel_lock(other); } + ast_queue_frame(other, f); - ast_mutex_unlock(&other->lock); + + ast_channel_unlock(other); + + ast_mutex_lock(&p->lock); + ast_clear_flag(p, LOCAL_GLARE_DETECT); + return 0; } diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 23f1409f7..429308ee0 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -142,7 +142,10 @@ typedef unsigned long long ast_group_t; struct ast_generator { void *(*alloc)(struct ast_channel *chan, void *params); void (*release)(struct ast_channel *chan, void *data); - /*! This function gets called with the channel locked */ + /*! This function gets called with the channel unlocked, but is called in + * the context of the channel thread so we know the channel is not going + * to disappear. This callback is responsible for locking the channel as + * necessary. */ int (*generate)(struct ast_channel *chan, void *data, int len, int samples); }; diff --git a/main/channel.c b/main/channel.c index 40aa67f7b..d5af9cb2e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1556,16 +1556,23 @@ static int generator_force(const void *data) int res; int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples); struct ast_channel *chan = (struct ast_channel *)data; + + ast_channel_lock(chan); tmp = chan->generatordata; chan->generatordata = NULL; generate = chan->generator->generate; + ast_channel_unlock(chan); + res = generate(chan, tmp, 0, 160); + chan->generatordata = tmp; + if (res) { if (option_debug) ast_log(LOG_DEBUG, "Auto-deactivating generator\n"); ast_deactivate_generator(chan); } + return 0; } @@ -1975,13 +1982,17 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } else if (blah == ZT_EVENT_TIMER_EXPIRED) { ioctl(chan->timingfd, ZT_TIMERACK, &blah); if (chan->timingfunc) { - chan->timingfunc(chan->timingdata); + /* save a copy of func/data before unlocking the channel */ + int (*func)(const void *) = chan->timingfunc; + void *data = chan->timingdata; + ast_channel_unlock(chan); + func(data); } else { blah = 0; ioctl(chan->timingfd, ZT_TIMERCONFIG, &blah); chan->timingdata = NULL; + ast_channel_unlock(chan); } - ast_channel_unlock(chan); /* cannot 'goto done' because the channel is already unlocked */ return &ast_null_frame; } else |