[asterisk-commits] russell: branch 1.6.1 r224935 - in /branches/1.6.1: ./ codecs/ include/asteri...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Oct 20 22:17:51 CDT 2009


Author: russell
Date: Tue Oct 20 22:17:44 2009
New Revision: 224935

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224935
Log:
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.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/codecs/codec_dahdi.c
    branches/1.6.1/include/asterisk/dsp.h
    branches/1.6.1/include/asterisk/frame.h
    branches/1.6.1/include/asterisk/translate.h
    branches/1.6.1/main/dsp.c
    branches/1.6.1/main/frame.c
    branches/1.6.1/main/translate.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/codecs/codec_dahdi.c?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/codecs/codec_dahdi.c (original)
+++ branches/1.6.1/codecs/codec_dahdi.c Tue Oct 20 22:17:44 2009
@@ -239,10 +239,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 == dahdip->fake) {
 		dahdip->fake = 0;
@@ -267,11 +266,10 @@
 		pvt->f.offset = AST_FRIENDLY_OFFSET;
 		pvt->f.src = pvt->t->name;
 		pvt->f.data.ptr = pvt->outbuf.c;
-		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... */
@@ -314,9 +312,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 == dahdip->fake) {
 		pvt->samples = 0;
 		dahdip->fake = 0;
@@ -353,10 +350,9 @@
 		pvt->f.src = pvt->t->name;
 		pvt->f.data.ptr = pvt->outbuf.c;
 		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... */

Modified: branches/1.6.1/include/asterisk/dsp.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/include/asterisk/dsp.h?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/include/asterisk/dsp.h (original)
+++ branches/1.6.1/include/asterisk/dsp.h Tue Oct 20 22:17:44 2009
@@ -156,16 +156,4 @@
  */
 int ast_dsp_init(void);
 
-/*!
- * \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 */

Modified: branches/1.6.1/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/include/asterisk/frame.h?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/include/asterisk/frame.h (original)
+++ branches/1.6.1/include/asterisk/frame.h Tue Oct 20 22:17:44 2009
@@ -126,14 +126,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.6.1/include/asterisk/translate.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/include/asterisk/translate.h?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/include/asterisk/translate.h (original)
+++ branches/1.6.1/include/asterisk/translate.h Tue Oct 20 22:17:44 2009
@@ -151,7 +151,6 @@
 	struct ast_trans_pvt *next; /*!< next in translator chain */
 	struct timeval nextin;
 	struct timeval nextout;
-	unsigned int destroy:1;
 };
 
 /*! \brief generic frameout function */
@@ -257,20 +256,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.6.1/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/dsp.c?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/main/dsp.c (original)
+++ branches/1.6.1/main/dsp.c Tue Oct 20 22:17:44 2009
@@ -395,7 +395,6 @@
 	digit_detect_state_t digit_state;
 	tone_detect_state_t cng_tone_state;
 	tone_detect_state_t ced_tone_state;
-	int destroy;
 };
 
 static void mute_fragment(struct ast_dsp *dsp, fragment_t *fragment)
@@ -1317,8 +1316,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;
@@ -1327,8 +1325,7 @@
 		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_FAX_DETECT)) {
@@ -1433,8 +1430,7 @@
 		if (chan) 
 			ast_queue_frame(chan, af);
 		ast_frfree(af);
-		ast_set_flag(outf, AST_FRFLAG_FROM_DSP);
-		return outf;
+		return ast_frisolate(outf);
 	} else {
 		return af;
 	}
@@ -1484,16 +1480,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. */
-
-		dsp->destroy = 1;
-
-		return;
-	}
 	ast_free(dsp);
 }
 
@@ -1652,16 +1638,3 @@
 	return _dsp_init(1);
 }
 
-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->destroy)
-		return;
-	
-	ast_dsp_free(dsp);
-}

Modified: branches/1.6.1/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/frame.c?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/main/frame.c (original)
+++ branches/1.6.1/main/frame.c Tue Oct 20 22:17:44 2009
@@ -330,12 +330,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;
 
@@ -420,8 +414,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.6.1/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/translate.c?view=diff&rev=224935&r1=224934&r2=224935
==============================================================================
--- branches/1.6.1/main/translate.c (original)
+++ branches/1.6.1/main/translate.c Tue Oct 20 22:17:44 2009
@@ -134,17 +134,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. */
-
-		pvt->destroy = 1;
-
-		return;
-	}
-
 	if (t->destroy)
 		t->destroy(pvt);
 	ast_free(pvt);
@@ -238,9 +227,7 @@
 	f->src = pvt->t->name;
 	f->data.ptr = pvt->outbuf.c;
 
-	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 @@
 
 	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);
-}




More information about the asterisk-commits mailing list