kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 192318 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@192354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-05-05 12:44:54 +00:00
parent 8e6c32f048
commit 1e4552ef29
6 changed files with 133 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/astobj2.c
View File

@@ -297,7 +297,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;
@@ -330,11 +330,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);
@@ -438,12 +439,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);
}