kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove double unlock from ast_read

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-07 14:43:18 +00:00
parent a1ffc320e4
commit a3d396b11b
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
channel.c
View File

@@ -744,8 +744,9 @@ int ast_answer(struct ast_channel *chan)
static void __ast_deactivate_generator(struct ast_channel *chan) void ast_deactivate_generator(struct ast_channel *chan)
{ {
ast_mutex_lock(&chan->lock);
if (chan->generatordata) { if (chan->generatordata) {
if (chan->generator && chan->generator->release) if (chan->generator && chan->generator->release)
chan->generator->release(chan, chan->generatordata); chan->generator->release(chan, chan->generatordata);
@@ -753,14 +754,9 @@ static void __ast_deactivate_generator(struct ast_channel *chan)
chan->generator = NULL; chan->generator = NULL;
chan->writeinterrupt = 0; chan->writeinterrupt = 0;
} }
}
void ast_deactivate_generator(struct ast_channel *chan)
{
ast_mutex_lock(&chan->lock);
__ast_deactivate_generator(chan);
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
} }
int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params) int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, void *params)
{ {
if (chan->generatordata) { if (chan->generatordata) {
@@ -1066,7 +1062,7 @@ struct ast_frame *ast_read(struct ast_channel *chan)
/* Stop if we're a zombie or need a soft hangup */ /* Stop if we're a zombie or need a soft hangup */
if (chan->zombie || ast_check_hangup(chan)) { if (chan->zombie || ast_check_hangup(chan)) {
if (chan->generator) if (chan->generator)
__ast_deactivate_generator(chan); ast_deactivate_generator(chan);
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
return NULL; return NULL;
} }
@@ -1200,7 +1196,7 @@ struct ast_frame *ast_read(struct ast_channel *chan)
if (!f) { if (!f) {
chan->_softhangup |= AST_SOFTHANGUP_DEV; chan->_softhangup |= AST_SOFTHANGUP_DEV;
if (chan->generator) if (chan->generator)
__ast_deactivate_generator(chan); ast_deactivate_generator(chan);
/* End the CDR if appropriate */ /* End the CDR if appropriate */
if (chan->cdr) if (chan->cdr)
ast_cdr_end(chan->cdr); ast_cdr_end(chan->cdr);
@@ -1225,15 +1221,12 @@ struct ast_frame *ast_read(struct ast_channel *chan)
tmp = chan->generatordata; tmp = chan->generatordata;
chan->generatordata = NULL; chan->generatordata = NULL;
generate = chan->generator->generate; generate = chan->generator->generate;
ast_mutex_unlock(&chan->lock);
res = generate(chan, tmp, f->datalen, f->samples); res = generate(chan, tmp, f->datalen, f->samples);
ast_mutex_lock(&chan->lock);
chan->generatordata = tmp; chan->generatordata = tmp;
if (res) { if (res) {
ast_log(LOG_DEBUG, "Auto-deactivating generator\n"); ast_log(LOG_DEBUG, "Auto-deactivating generator\n");
__ast_deactivate_generator(chan); ast_deactivate_generator(chan);
} }
ast_mutex_unlock(&chan->lock);
} }
if (chan->fin & 0x80000000) if (chan->fin & 0x80000000)
ast_frame_dump(chan->name, f, "<<"); ast_frame_dump(chan->name, f, "<<");
@@ -1427,7 +1420,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
} }
if (chan->generatordata) { if (chan->generatordata) {
if (chan->writeinterrupt) if (chan->writeinterrupt)
__ast_deactivate_generator(chan); ast_deactivate_generator(chan);
else { else {
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
return 0; return 0;