From ffe83464714a813863de9d89746a782221c6f516 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 21 Oct 2009 03:15:06 +0000 Subject: [PATCH] Merged revisions 224932 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r224932 | russell | 2009-10-20 22:09:04 -0500 (Tue, 20 Oct 2009) | 12 lines Merged revisions 224931 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r224931 | russell | 2009-10-20 21:59:54 -0500 (Tue, 20 Oct 2009) | 5 lines Isolate frames returned from a DSP instance or codec translator. The reasoning for these changes are the same as what I wrote in the commit message for rev 222878. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@224933 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/codec_dahdi.c | 12 ++++------- include/asterisk/dsp.h | 12 ----------- include/asterisk/frame.h | 8 ------- include/asterisk/translate.h | 15 ------------- main/dsp.c | 42 ++++++------------------------------ main/frame.c | 8 ------- main/translate.c | 29 +------------------------ 7 files changed, 11 insertions(+), 115 deletions(-) diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 8e4153a283..df9de29217 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -235,10 +235,9 @@ static struct ast_frame *dahdi_encoder_frameout(struct ast_trans_pvt *pvt) pvt->f.offset = 0; pvt->f.datalen = 0; pvt->f.mallocd = 0; - ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR); pvt->samples = 0; - return &pvt->f; + return ast_frisolate(&pvt->f); } else if (1 == dahdip->fake) { dahdip->fake = 0; @@ -263,11 +262,10 @@ static struct ast_frame *dahdi_encoder_frameout(struct ast_trans_pvt *pvt) pvt->f.offset = AST_FRIENDLY_OFFSET; pvt->f.src = pvt->t->name; pvt->f.data = pvt->outbuf; - ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR); pvt->samples = 0; pvt->datalen = 0; - return &pvt->f; + return ast_frisolate(&pvt->f); } /* Shouldn't get here... */ @@ -310,9 +308,8 @@ static struct ast_frame *dahdi_decoder_frameout(struct ast_trans_pvt *pvt) pvt->f.offset = 0; pvt->f.datalen = 0; pvt->f.mallocd = 0; - ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR); pvt->samples = 0; - return &pvt->f; + return ast_frisolate(&pvt->f); } else if (1 == dahdip->fake) { pvt->samples = 0; dahdip->fake = 0; @@ -349,10 +346,9 @@ static struct ast_frame *dahdi_decoder_frameout(struct ast_trans_pvt *pvt) pvt->f.src = pvt->t->name; pvt->f.data = pvt->outbuf; pvt->f.samples = dahdip->required_samples; - ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR); pvt->samples = 0; - return &pvt->f; + return ast_frisolate(&pvt->f); } /* Shouldn't get here... */ diff --git a/include/asterisk/dsp.h b/include/asterisk/dsp.h index 5bab2b51cc..10ed53d1b1 100644 --- a/include/asterisk/dsp.h +++ b/include/asterisk/dsp.h @@ -115,16 +115,4 @@ int ast_dsp_get_tstate(struct ast_dsp *dsp); /*! \brief Get tcount (Threshold counter) */ int ast_dsp_get_tcount(struct ast_dsp *dsp); -/*! - * \brief Hint that a frame from a dsp was freed - * - * This is called from ast_frame_free if AST_FRFLAG_FROM_DSP is set. This occurs - * because it is possible for the dsp to be freed while someone still holds a reference - * to the frame that is in that dsp. This has been known to happen when the dsp on a DAHDI - * channel detects a busy signal. The channel is hung up, and the application that read the - * frame to begin with still has a reference to the frame. - * - * \return nothing - */ -void ast_dsp_frame_freed(struct ast_frame *fr); #endif /* _ASTERISK_DSP_H */ diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index b1e7344d20..a5883cbaaf 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -126,14 +126,6 @@ enum ast_frame_type { enum { /*! This frame contains valid timing information */ AST_FRFLAG_HAS_TIMING_INFO = (1 << 0), - /*! This frame came from a translator and is still the original frame. - * The translator can not be free'd if the frame inside of it still has - * this flag set. */ - AST_FRFLAG_FROM_TRANSLATOR = (1 << 1), - /*! This frame came from a dsp and is still the original frame. - * The dsp cannot be free'd if the frame inside of it still has - * this flag set. */ - AST_FRFLAG_FROM_DSP = (1 << 2), }; /*! \brief Data structure associated with a single frame of data diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h index 97f10283f3..66d137e8d9 100644 --- a/include/asterisk/translate.h +++ b/include/asterisk/translate.h @@ -146,7 +146,6 @@ struct ast_trans_pvt { struct ast_trans_pvt *next; /*!< next in translator chain */ struct timeval nextin; struct timeval nextout; - unsigned int destroy:1; }; /*! \brief generic frameout function */ @@ -252,20 +251,6 @@ unsigned int ast_translate_path_steps(unsigned int dest, unsigned int src); */ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src); -/*! - * \brief Hint that a frame from a translator has been freed - * - * This is sort of a hack. This function gets called when ast_frame_free() gets - * called on a frame that has the AST_FRFLAG_FROM_TRANSLATOR flag set. This is - * because it is possible for a translation path to be destroyed while a frame - * from a translator is still in use. Specifically, this happens if a masquerade - * happens after a call to ast_read() but before the frame is done being processed, - * since the frame processing is generally done without the channel lock held. - * - * \return nothing - */ -void ast_translate_frame_freed(struct ast_frame *fr); - #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/main/dsp.c b/main/dsp.c index 72be1da5e3..5cdfc6161f 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -1241,8 +1241,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, memset(&dsp->f, 0, sizeof(dsp->f)); dsp->f.frametype = AST_FRAME_NULL; ast_frfree(af); - ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP); - return &dsp->f; + return ast_frisolate(&dsp->f); } if ((dsp->features & DSP_FEATURE_BUSY_DETECT) && ast_dsp_busydetect(dsp)) { chan->_softhangup |= AST_SOFTHANGUP_DEV; @@ -1251,8 +1250,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, dsp->f.subclass = AST_CONTROL_BUSY; ast_frfree(af); ast_debug(1, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name); - ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP); - return &dsp->f; + return ast_frisolate(&dsp->f); } if (((dsp->features & DSP_FEATURE_DTMF_DETECT) || (dsp->features & DSP_FEATURE_FAX_DETECT))) { digit = __ast_dsp_digitdetect(dsp, shortdata, len, &writeback); @@ -1273,8 +1271,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, if (chan) ast_queue_frame(chan, af); ast_frfree(af); - ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP); - return &dsp->f; + return ast_frisolate(&dsp->f); } } else { if (digit) { @@ -1300,8 +1297,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, ast_queue_frame(chan, af); ast_frfree(af); } - ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP); - return &dsp->f; + return ast_frisolate(&dsp->f); } else { memset(&dsp->f, 0, sizeof(dsp->f)); if (dsp->thinkdigit != 'x') { @@ -1318,8 +1314,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, if (chan) ast_queue_frame(chan, af); ast_frfree(af); - ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP); - return &dsp->f; + return ast_frisolate(&dsp->f); } } } else if (dsp->digit_state.current_digits > 1 || @@ -1336,8 +1331,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, if (chan) ast_queue_frame(chan, af); ast_frfree(af); - ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP); - return &dsp->f; + return ast_frisolate(&dsp->f); } } if ((dsp->features & DSP_FEATURE_CALL_PROGRESS)) { @@ -1409,17 +1403,6 @@ void ast_dsp_set_features(struct ast_dsp *dsp, int features) void ast_dsp_free(struct ast_dsp *dsp) { - if (ast_test_flag(&dsp->f, AST_FRFLAG_FROM_DSP)) { - /* If this flag is still set, that means that the dsp's destruction - * been torn down, while we still have a frame out there being used. - * When ast_frfree() gets called on that frame, this ast_trans_pvt - * will get destroyed, too. */ - - /* Set the magic flag to destroy the dsp when the frame is freed */ - dsp->freqcount = -1; - - return; - } ast_free(dsp); } @@ -1534,16 +1517,3 @@ int ast_dsp_get_tcount(struct ast_dsp *dsp) return dsp->tcount; } -void ast_dsp_frame_freed(struct ast_frame *fr) -{ - struct ast_dsp *dsp; - - ast_clear_flag(fr, AST_FRFLAG_FROM_DSP); - - dsp = (struct ast_dsp *) (((char *) fr) - offsetof(struct ast_dsp, f)); - - if (dsp->freqcount != -1) - return; - - ast_dsp_free(dsp); -} diff --git a/main/frame.c b/main/frame.c index a3795bd702..a1696d4d40 100644 --- a/main/frame.c +++ b/main/frame.c @@ -330,12 +330,6 @@ static void frame_cache_cleanup(void *data) static void __frame_free(struct ast_frame *fr, int cache) { - if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) { - ast_translate_frame_freed(fr); - } else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) { - ast_dsp_frame_freed(fr); - } - if (!fr->mallocd) return; @@ -420,8 +414,6 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr) out->seqno = fr->seqno; } } else { - ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR); - ast_clear_flag(fr, AST_FRFLAG_FROM_DSP); out = fr; } diff --git a/main/translate.c b/main/translate.c index 711a7995cd..e93f0a35b6 100644 --- a/main/translate.c +++ b/main/translate.c @@ -134,17 +134,6 @@ static void destroy(struct ast_trans_pvt *pvt) { struct ast_translator *t = pvt->t; - if (ast_test_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR)) { - /* If this flag is still set, that means that the translation path has - * been torn down, while we still have a frame out there being used. - * When ast_frfree() gets called on that frame, this ast_trans_pvt - * will get destroyed, too. */ - - pvt->destroy = 1; - - return; - } - if (t->destroy) t->destroy(pvt); ast_free(pvt); @@ -238,9 +227,7 @@ struct ast_frame *ast_trans_frameout(struct ast_trans_pvt *pvt, f->src = pvt->t->name; f->data = pvt->outbuf; - ast_set_flag(f, AST_FRFLAG_FROM_TRANSLATOR); - - return f; + return ast_frisolate(f); } static struct ast_frame *default_frameout(struct ast_trans_pvt *pvt) @@ -905,17 +892,3 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src return res; } - -void ast_translate_frame_freed(struct ast_frame *fr) -{ - struct ast_trans_pvt *pvt; - - ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR); - - pvt = (struct ast_trans_pvt *) (((char *) fr) - offsetof(struct ast_trans_pvt, f)); - - if (!pvt->destroy) - return; - - destroy(pvt); -}