diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-04 19:34:33 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-04 19:34:33 +0000 |
| commit | b6d7672de3a8456657d7252a5db3ec19069d81c0 (patch) | |
| tree | dc4c58170a0985b558c769b9523942f98092fe7d /main | |
| parent | 86849e1951c5359980955ed796e7e7d6402f4590 (diff) | |
Merged revisions 192059 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r192059 | kpfleming | 2009-05-04 18:24:16 +0200 (Mon, 04 May 2009) | 5 lines
Ensure that astobj2 memory allocations are properly accounted for when MALLOC_DEBUG is used
This commit ensures that all astobj2 allocated objects are properly accounted for in MALLOC_DEBUG mode by passing down the file/function/line information from the module/function that actually called the astobj2 allocation function.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@192175 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/astobj2.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 7dd4c7ec1..416632ff2 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -135,7 +135,6 @@ enum ao2_callback_type { /* the underlying functions common to debug and non-debug versions */ static int __ao2_ref(void *user_data, const int delta); -static void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn); static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const uint n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn); static struct bucket_list *__ao2_link(struct ao2_container *c, void *user_data, const char *file, int line, const char *func); @@ -303,7 +302,7 @@ static int __ao2_ref(void *user_data, const int delta) * We always alloc at least the size of a void *, * for debugging purposes. */ -static void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn) +static void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn, char *file, int line, const char *funcname) { /* allocation */ struct astobj2 *obj; @@ -311,7 +310,11 @@ static void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn) if (data_size < sizeof(void *)) data_size = sizeof(void *); +#if defined(__AST_DEBUG_MALLOC) + obj = __ast_calloc(1, sizeof(*obj) + data_size, file, line, funcname); +#else obj = ast_calloc(1, sizeof(*obj) + data_size); +#endif if (obj == NULL) return NULL; @@ -338,7 +341,7 @@ void *_ao2_alloc_debug(size_t data_size, ao2_destructor_fn destructor_fn, char * void *obj; FILE *refo = fopen(REF_FILE,"a"); - obj = __ao2_alloc(data_size, destructor_fn); + obj = __ao2_alloc(data_size, destructor_fn, file, line, funcname); if (obj == NULL) return NULL; @@ -354,7 +357,7 @@ void *_ao2_alloc_debug(size_t data_size, ao2_destructor_fn destructor_fn, char * void *_ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn) { - return __ao2_alloc(data_size, destructor_fn); + return __ao2_alloc(data_size, destructor_fn, NULL, 0, NULL); } |