diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-19 01:39:14 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-19 01:39:14 +0000 |
commit | d328c2ea16345797f774231ab1a9c187af850a5e (patch) | |
tree | a9ad01ca57546de53f45ae621678001de1350927 | |
parent | 90c2670eb0d939aab851f4a56a062e57ef244719 (diff) |
When astmm is in use, define ast_malloc and friends to malloc, etc., so that
it doesn't report that all allocations are coming from utils.h. Also, add some
more information to the error message astmm reports when a memory allocation
failure occurs.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@13513 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | astmm.c | 4 | ||||
-rw-r--r-- | include/asterisk/utils.h | 15 |
2 files changed, 17 insertions, 2 deletions
@@ -108,9 +108,9 @@ static inline void *__ast_alloc_region(size_t size, const enum func_type which, } ast_mutex_unlock(®lock); if (!reg) { - fprintf(stderr, "Memory allocation failure\n"); + fprintf(stderr, "Memory Allocation Failure - '%d' bytes in function %s at line %d of %s\n", (int) size, func, lineno, file); if (mmlog) { - fprintf(mmlog, "%ld - Memory allocation failure\n", time(NULL)); + fprintf(stderr, "%ld - Memory Allocation Failure - '%d' bytes in function %s at line %d of %s\n", time(NULL), (int) size, func, lineno, file); fflush(mmlog); } } diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 416f362f6..c702fa6fb 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -246,6 +246,8 @@ int getloadavg(double *list, int nelem); long int ast_random(void); #endif +#ifndef __AST_DEBUG_MALLOC + /*! \brief A wrapper for malloc() @@ -383,6 +385,19 @@ char *_ast_strndup(const char *str, size_t len, const char *file, int lineno, co } ) +#else + +/* If astmm is in use, let it handle these. Otherwise, it will report that + all allocations are coming from this header file */ + +#define ast_malloc(a) malloc(a) +#define ast_calloc(a,b) calloc(a,b) +#define ast_realloc(a,b) realloc(a,b) +#define ast_strdup(a) strdup(a) +#define ast_strndup(a,b) strndup(a,b) + +#endif /* AST_DEBUG_MALLOC */ + #if !defined(ast_strdupa) && defined(__GNUC__) /*! \brief duplicate a string in memory from the stack |