From: Corey Farrell <git@cfware.com>
Date: Fri, 8 Nov 2019 15:20:13 +0000 (-0500)
Subject: core: Improve MALLOC_DEBUG for frames.
X-Git-Tag: 18.0.0-rc1~306^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a1f30af0451c22989e1a4e832eeaf8b337f8a89;p=thirdparty%2Fasterisk.git

core: Improve MALLOC_DEBUG for frames.

* Pass caller information to frame allocation functions.
* Disable caching as it interfers with MALLOC_DEBUG reporting.
* Stop using ast_calloc_cache.

Change-Id: Id343cd80a3db941d2daefde2a060750fea8cd260
---

diff --git a/channels/Makefile b/channels/Makefile
index 96421d82b0..b641173fe8 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -24,6 +24,8 @@ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 endif
 
 $(call MOD_ADD_C,chan_iax2,$(wildcard iax2/*.c))
+iax2/parser.o: _ASTCFLAGS+=$(call get_menuselect_cflags,MALLOC_DEBUG)
+
 $(call MOD_ADD_C,chan_sip,$(wildcard sip/*.c))
 $(call MOD_ADD_C,chan_pjsip,$(wildcard pjsip/*.c))
 $(call MOD_ADD_C,chan_dahdi,$(wildcard dahdi/*.c) sig_analog.c sig_pri.c sig_ss7.c)
diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c
index b94d306d58..86839388b1 100644
--- a/channels/iax2/parser.c
+++ b/channels/iax2/parser.c
@@ -52,7 +52,11 @@ static int frames = 0;
 static int iframes = 0;
 static int oframes = 0;
 
-#if !defined(LOW_MEMORY)
+#if (defined(LOW_MEMORY) || defined(MALLOC_DEBUG)) && !defined(NO_FRAME_CACHE)
+#define NO_FRAME_CACHE
+#endif
+
+#if !defined(NO_FRAME_CACHE)
 static void frame_cache_cleanup(void *data);
 
 /*! \brief A per-thread cache of iax_frame structures */
@@ -1215,7 +1219,7 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab
 {
 	struct iax_frame *fr;
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	if (cacheable) {
 		struct iax_frames *iax_frames;
 		struct iax_frame *smallest;
@@ -1243,13 +1247,13 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab
 					iax_frames->size--;
 					ast_free(smallest);
 				}
-				if (!(fr = ast_calloc_cache(1, sizeof(*fr) + datalen))) {
+				if (!(fr = ast_calloc(1, sizeof(*fr) + datalen))) {
 					return NULL;
 				}
 				fr->afdatalen = datalen;
 			}
 		} else {
-			if (!(fr = ast_calloc_cache(1, sizeof(*fr) + datalen))) {
+			if (!(fr = ast_calloc(1, sizeof(*fr) + datalen))) {
 				return NULL;
 			}
 			fr->afdatalen = datalen;
@@ -1280,7 +1284,7 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab
 
 void iax_frame_free(struct iax_frame *fr)
 {
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	struct iax_frames *iax_frames = NULL;
 #endif
 
@@ -1295,7 +1299,7 @@ void iax_frame_free(struct iax_frame *fr)
 	}
 	ast_atomic_fetchadd_int(&frames, -1);
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	if (!fr->cacheable
 		|| !ast_opt_cache_media_frames
 		|| !(iax_frames = ast_threadstorage_get(&frame_cache, sizeof(*iax_frames)))) {
@@ -1319,7 +1323,7 @@ void iax_frame_free(struct iax_frame *fr)
 	ast_free(fr);
 }
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 static void frame_cache_cleanup(void *data)
 {
 	struct iax_frames *framelist = data;
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index b618d1965f..780cba3e66 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -560,14 +560,16 @@ void ast_frame_dtor(struct ast_frame *frame);
  * should be the last operation you do with that frame before freeing
  * it (or exiting the block, if the frame is on the stack.)
  */
-struct ast_frame *ast_frisolate(struct ast_frame *fr);
+#define ast_frisolate(fr) __ast_frisolate(fr, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+struct ast_frame *__ast_frisolate(struct ast_frame *fr, const char *file, int line, const char *func);
 
 /*! \brief Copies a frame
  * \param fr frame to copy
  * Duplicates a frame -- should only rarely be used, typically frisolate is good enough
  * \return Returns a frame on success, NULL on error
  */
-struct ast_frame *ast_frdup(const struct ast_frame *fr);
+#define ast_frdup(fr) __ast_frdup(fr, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+struct ast_frame *__ast_frdup(const struct ast_frame *fr, const char *file, int line, const char *func);
 
 void ast_swapcopy_samples(void *dst, const void *src, int samples);
 
diff --git a/main/Makefile b/main/Makefile
index a22a1ad2f9..299998c049 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -159,6 +159,7 @@ cdr.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
 crypt.o: _ASTCFLAGS+=$(CRYPT_INCLUDE)
 db.o: _ASTCFLAGS+=$(SQLITE3_INCLUDE)
 dsp.o: _ASTCFLAGS+=$(call get_menuselect_cflags,RADIO_RELAX)
+frame.o: _ASTCFLAGS+=$(call get_menuselect_cflags,MALLOC_DEBUG)
 http.o: _ASTCFLAGS+=$(GMIMECFLAGS)
 iostream.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
 json.o: _ASTCFLAGS+=$(JANSSON_INCLUDE)
diff --git a/main/frame.c b/main/frame.c
index 208c82d2d2..f7a5222b07 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -43,7 +43,11 @@
 #include "asterisk/dsp.h"
 #include "asterisk/file.h"
 
-#if !defined(LOW_MEMORY)
+#if (defined(LOW_MEMORY) || defined(MALLOC_DEBUG)) && !defined(NO_FRAME_CACHE)
+#define NO_FRAME_CACHE
+#endif
+
+#if !defined(NO_FRAME_CACHE)
 static void frame_cache_cleanup(void *data);
 
 /*! \brief A per-thread cache of frame headers */
@@ -72,11 +76,11 @@ struct ast_frame_cache {
 
 struct ast_frame ast_null_frame = { AST_FRAME_NULL, };
 
-static struct ast_frame *ast_frame_header_new(void)
+static struct ast_frame *ast_frame_header_new(const char *file, int line, const char *func)
 {
 	struct ast_frame *f;
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	struct ast_frame_cache *frames;
 
 	if ((frames = ast_threadstorage_get(&frame_cache, sizeof(*frames)))) {
@@ -89,19 +93,18 @@ static struct ast_frame *ast_frame_header_new(void)
 			return f;
 		}
 	}
-	if (!(f = ast_calloc_cache(1, sizeof(*f))))
-		return NULL;
-#else
-	if (!(f = ast_calloc(1, sizeof(*f))))
-		return NULL;
 #endif
 
+	if (!(f = __ast_calloc(1, sizeof(*f), file, line, func))) {
+		return NULL;
+	}
+
 	f->mallocd_hdr_len = sizeof(*f);
 
 	return f;
 }
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 static void frame_cache_cleanup(void *data)
 {
 	struct ast_frame_cache *frames = data;
@@ -119,7 +122,7 @@ static void __frame_free(struct ast_frame *fr, int cache)
 	if (!fr->mallocd)
 		return;
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	if (fr->mallocd == AST_MALLOCD_HDR
 		&& cache
 		&& ast_opt_cache_media_frames) {
@@ -185,7 +188,7 @@ void ast_frame_dtor(struct ast_frame *f)
  * (header, src, data).
  * On return all components are malloc'ed
  */
-struct ast_frame *ast_frisolate(struct ast_frame *fr)
+struct ast_frame *__ast_frisolate(struct ast_frame *fr, const char *file, int line, const char *func)
 {
 	struct ast_frame *out;
 	void *newdata;
@@ -194,7 +197,7 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
 	   since it is more efficient
 	*/
 	if (fr->mallocd == 0) {
-		return ast_frdup(fr);
+		return __ast_frdup(fr, file, line, func);
 	}
 
 	/* if everything is already malloc'd, we are done */
@@ -205,7 +208,7 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
 
 	if (!(fr->mallocd & AST_MALLOCD_HDR)) {
 		/* Allocate a new header if needed */
-		if (!(out = ast_frame_header_new())) {
+		if (!(out = ast_frame_header_new(file, line, func))) {
 			return NULL;
 		}
 		out->frametype = fr->frametype;
@@ -291,13 +294,13 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
 	return out;
 }
 
-struct ast_frame *ast_frdup(const struct ast_frame *f)
+struct ast_frame *__ast_frdup(const struct ast_frame *f, const char *file, int line, const char *func)
 {
 	struct ast_frame *out = NULL;
 	int len, srclen = 0;
 	void *buf = NULL;
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	struct ast_frame_cache *frames;
 #endif
 
@@ -313,7 +316,7 @@ struct ast_frame *ast_frdup(const struct ast_frame *f)
 	if (srclen > 0)
 		len += srclen + 1;
 
-#if !defined(LOW_MEMORY)
+#if !defined(NO_FRAME_CACHE)
 	if ((frames = ast_threadstorage_get(&frame_cache, sizeof(*frames)))) {
 		AST_LIST_TRAVERSE_SAFE_BEGIN(&frames->list, out, frame_list) {
 			if (out->mallocd_hdr_len >= len) {
@@ -332,7 +335,7 @@ struct ast_frame *ast_frdup(const struct ast_frame *f)
 #endif
 
 	if (!buf) {
-		if (!(buf = ast_calloc_cache(1, len)))
+		if (!(buf = __ast_calloc(1, len, file, line, func)))
 			return NULL;
 		out = buf;
 		out->mallocd_hdr_len = len;