diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-05 13:00:04 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-05 13:00:04 +0000 |
commit | 12f6b763d206e5a57e07f45eabd90c7f8c61fd49 (patch) | |
tree | d3359456f178cd1af1e2b160bf2674b9334b95f8 /main/astobj2.c | |
parent | a01063165d8e8500f6a55f4abafe5e52f72e7596 (diff) |
Merged revisions 192318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r192318 | kpfleming | 2009-05-05 12:34:19 +0200 (Tue, 05 May 2009) | 5 lines
Properly account for memory allocated for channels and datastores
As in previous commits, when channels are allocated (with ast_channel_alloc) or datastores are allocated (with ast_datastore_alloc) properly account for the memory being owned by the caller, instead of the allocator function itself.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@192355 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/astobj2.c')
-rw-r--r-- | main/astobj2.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 416632ff2..cf3b2c821 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -302,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, char *file, int line, const char *funcname) +static void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn, const char *file, int line, const char *funcname) { /* allocation */ struct astobj2 *obj; @@ -335,11 +335,12 @@ static void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn, char return EXTERNAL_OBJ(obj); } -void *_ao2_alloc_debug(size_t data_size, ao2_destructor_fn destructor_fn, char *tag, char *file, int line, const char *funcname) +void *_ao2_alloc_debug(size_t data_size, ao2_destructor_fn destructor_fn, char *tag, + const char *file, int line, const char *funcname, int ref_debug) { /* allocation */ void *obj; - FILE *refo = fopen(REF_FILE,"a"); + FILE *refo = ref_debug ? fopen(REF_FILE,"a") : NULL; obj = __ao2_alloc(data_size, destructor_fn, file, line, funcname); @@ -443,12 +444,13 @@ static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, cons } struct ao2_container *_ao2_container_alloc_debug(const unsigned int n_buckets, ao2_hash_fn *hash_fn, - ao2_callback_fn *cmp_fn, char *tag, char *file, int line, const char *funcname) + ao2_callback_fn *cmp_fn, char *tag, char *file, int line, + const char *funcname, int ref_debug) { /* XXX maybe consistency check on arguments ? */ /* compute the container size */ size_t container_size = sizeof(struct ao2_container) + n_buckets * sizeof(struct bucket); - struct ao2_container *c = _ao2_alloc_debug(container_size, container_destruct_debug, tag, file, line, funcname); + struct ao2_container *c = _ao2_alloc_debug(container_size, container_destruct_debug, tag, file, line, funcname, ref_debug); return __ao2_container_alloc(c, n_buckets, hash_fn, cmp_fn); } |