[svn-commits] russell: branch 1.4 r224931 - in /branches/1.4: codecs/ include/asterisk/ main/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Oct 20 21:59:58 CDT 2009
Author: russell
Date: Tue Oct 20 21:59:54 2009
New Revision: 224931
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224931
Log:
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.
Modified:
branches/1.4/codecs/codec_dahdi.c
branches/1.4/include/asterisk/dsp.h
branches/1.4/include/asterisk/frame.h
branches/1.4/include/asterisk/translate.h
branches/1.4/main/dsp.c
branches/1.4/main/frame.c
branches/1.4/main/translate.c
Modified: branches/1.4/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/codecs/codec_dahdi.c?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/codecs/codec_dahdi.c (original)
+++ branches/1.4/codecs/codec_dahdi.c Tue Oct 20 21:59:54 2009
@@ -249,10 +249,9 @@
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 == ztp->fake) {
ztp->fake = 0;
@@ -277,11 +276,10 @@
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... */
@@ -324,9 +322,8 @@
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 == ztp->fake) {
pvt->samples = 0;
ztp->fake = 0;
@@ -363,10 +360,9 @@
pvt->f.src = pvt->t->name;
pvt->f.data = pvt->outbuf;
pvt->f.samples = ztp->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... */
Modified: branches/1.4/include/asterisk/dsp.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/dsp.h?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/include/asterisk/dsp.h (original)
+++ branches/1.4/include/asterisk/dsp.h Tue Oct 20 21:59:54 2009
@@ -108,17 +108,4 @@
/*! \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 Zap
- * 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 */
Modified: branches/1.4/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/frame.h?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/include/asterisk/frame.h (original)
+++ branches/1.4/include/asterisk/frame.h Tue Oct 20 21:59:54 2009
@@ -127,14 +127,6 @@
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
Modified: branches/1.4/include/asterisk/translate.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/translate.h?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/include/asterisk/translate.h (original)
+++ branches/1.4/include/asterisk/translate.h Tue Oct 20 21:59:54 2009
@@ -137,10 +137,6 @@
int samples; /*!< samples available in outbuf */
/*!
* \brief actual space used in outbuf
- *
- * Also, for the sake of ABI compatability, a magic value of -1 in this
- * field means that the pvt has been requested to be destroyed, but is
- * pending destruction until ast_translate_frame_freed() gets called.
*/
int datalen;
void *pvt; /*!< more private data, if any */
@@ -252,20 +248,6 @@
*/
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
Modified: branches/1.4/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/dsp.c?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/main/dsp.c (original)
+++ branches/1.4/main/dsp.c Tue Oct 20 21:59:54 2009
@@ -1486,8 +1486,7 @@
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;
@@ -1495,8 +1494,7 @@
dsp->f.frametype = AST_FRAME_CONTROL;
dsp->f.subclass = AST_CONTROL_BUSY;
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_DTMF_DETECT)) {
digit = __ast_dsp_digitdetect(dsp, shortdata, len, &writeback);
@@ -1517,8 +1515,7 @@
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) {
@@ -1544,8 +1541,7 @@
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') {
@@ -1562,8 +1558,7 @@
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) {
@@ -1579,8 +1574,7 @@
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->td.dtmf.current_digits) {
@@ -1593,8 +1587,7 @@
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);
}
}
}
@@ -1664,17 +1657,6 @@
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 hint that this has been requested to be destroyed. */
- dsp->freqcount = -1;
-
- return;
- }
free(dsp);
}
@@ -1803,17 +1785,3 @@
{
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);
-}
Modified: branches/1.4/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/frame.c?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/main/frame.c (original)
+++ branches/1.4/main/frame.c Tue Oct 20 21:59:54 2009
@@ -342,12 +342,6 @@
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;
@@ -432,8 +426,6 @@
out->seqno = fr->seqno;
}
} else {
- ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
- ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
out = fr;
}
Modified: branches/1.4/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/translate.c?view=diff&rev=224931&r1=224930&r2=224931
==============================================================================
--- branches/1.4/main/translate.c (original)
+++ branches/1.4/main/translate.c Tue Oct 20 21:59:54 2009
@@ -140,18 +140,6 @@
{
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. */
-
- /* Set the magic hint that this has been requested to be destroyed. */
- pvt->datalen = -1;
-
- return;
- }
-
if (t->destroy)
t->destroy(pvt);
free(pvt);
@@ -245,9 +233,7 @@
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)
@@ -970,17 +956,3 @@
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->datalen != -1)
- return;
-
- destroy(pvt);
-}
More information about the svn-commits
mailing list