kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 49536 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49536 | kpfleming | 2007-01-04 15:58:42 -0600 (Thu, 04 Jan 2007) | 2 lines

don't mark these allocations as 'cache' allocations when caching has been disabled

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-01-04 21:59:06 +00:00
parent af3e5903c8
commit c5c17a1434
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/iax2-parser.c
View File

@@ -959,13 +959,17 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab
} }
AST_LIST_TRAVERSE_SAFE_END AST_LIST_TRAVERSE_SAFE_END
} }
#endif
if (!fr) { if (!fr) {
if (!(fr = ast_calloc_cache(1, sizeof(*fr) + datalen))) if (!(fr = ast_calloc_cache(1, sizeof(*fr) + datalen)))
return NULL; return NULL;
fr->mallocd_datalen = datalen; fr->mallocd_datalen = datalen;
} }
#else
if (!(fr = ast_calloc(1, sizeof(*fr) + datalen)))
return NULL;
fr->mallocd_datalen = datalen;
#endif
fr->direction = direction; fr->direction = direction;
fr->retrans = -1; fr->retrans = -1;

6
main/frame.c
View File

@@ -304,10 +304,12 @@ static struct ast_frame *ast_frame_header_new(void)
return f; return f;
} }
} }
#endif
if (!(f = ast_calloc_cache(1, sizeof(*f)))) if (!(f = ast_calloc_cache(1, sizeof(*f))))
return NULL; return NULL;
#else
if (!(f = ast_calloc(1, sizeof(*f))))
return NULL;
#endif
f->mallocd_hdr_len = sizeof(*f); f->mallocd_hdr_len = sizeof(*f);
#ifdef TRACE_FRAMES #ifdef TRACE_FRAMES