kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "core: Improve MALLOC_DEBUG for frames."

Browse Source
This commit is contained in:
Joshua Colp
2019-12-02 06:45:24 -06:00
committed by Gerrit Code Review
parent 330ffa2bce 8a1f30af04
commit cd3a2a478f
5 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/Makefile
View File

@@ -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)

18
channels/iax2/parser.c
View File

@@ -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;