diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-12-27 18:33:44 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-12-27 18:33:44 +0000 |
commit | d68c7c8ce646fe75ec0ebead66f52871ada4444f (patch) | |
tree | dfeb14f90a471988d68d943500c6f035660efe8a /include | |
parent | 29ed493b40ad6c027a83888882d0689bc9079ecc (diff) |
Merged revisions 48987 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48987 | kpfleming | 2006-12-27 12:29:13 -0600 (Wed, 27 Dec 2006) | 2 lines
allow 'show memory' and 'show memory summary' to distinguish memory allocations that were done for caching purposes, so they don't look like memory leaks
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/astmm.h | 4 | ||||
-rw-r--r-- | include/asterisk/utils.h | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index 7e987b099..f1f838ef0 100644 --- a/include/asterisk/astmm.h +++ b/include/asterisk/astmm.h @@ -44,6 +44,7 @@ #undef vasprintf void *__ast_calloc(size_t nmemb, size_t size, const char *file, int lineno, const char *func); +void *__ast_calloc_cache(size_t nmemb, size_t size, const char *file, int lineno, const char *func); void *__ast_malloc(size_t size, const char *file, int lineno, const char *func); void __ast_free(void *ptr, const char *file, int lineno, const char *func); void *__ast_realloc(void *ptr, size_t size, const char *file, int lineno, const char *func); @@ -59,6 +60,9 @@ void __ast_mm_init(void); #define calloc(a,b) \ __ast_calloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__) +#define ast_calloc_cache(a,b) \ + __ast_calloc_cache(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__) + #define malloc(a) \ __ast_malloc(a,__FILE__, __LINE__, __PRETTY_FUNCTION__) diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 81637e50b..714574b19 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -362,6 +362,19 @@ void * attribute_malloc _ast_calloc(size_t num, size_t len, const char *file, in ) /*! + * \brief A wrapper for calloc() for use in cache pools + * + * ast_calloc_cache() is a wrapper for calloc() that will generate an Asterisk log + * message in the case that the allocation fails. When memory debugging is in use, + * the memory allocated by this function will be marked as 'cache' so it can be + * distinguished from normal memory allocations. + * + * The arguments and return value are the same as calloc() + */ +#define ast_calloc_cache(num, len) \ + _ast_calloc((num), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__) + +/*! * \brief A wrapper for realloc() * * ast_realloc() is a wrapper for realloc() that will generate an Asterisk log |