From ec5116f80c7ed6922bdc483f11b220ebbee8618b Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 5 May 2009 10:34:19 +0000 Subject: 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/trunk@192318 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/astobj2.h | 28 ++++++++++++++++++++-------- include/asterisk/channel.h | 13 +++++++++++-- include/asterisk/datastore.h | 5 ++++- 3 files changed, 35 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index ce8ed4a88..953482f19 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -402,10 +402,15 @@ typedef void (*ao2_destructor_fn)(void *); * @{ */ -#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC) +#if defined(REF_DEBUG) -#define ao2_t_alloc(data_size, destructor_fn, debug_msg) __ao2_alloc_debug((data_size), (destructor_fn), (debug_msg), __FILE__, __LINE__, __PRETTY_FUNCTION__) -#define ao2_alloc(data_size, destructor_fn) __ao2_alloc_debug((data_size), (destructor_fn), "", __FILE__, __LINE__, __PRETTY_FUNCTION__) +#define ao2_t_alloc(data_size, destructor_fn, debug_msg) __ao2_alloc_debug((data_size), (destructor_fn), (debug_msg), __FILE__, __LINE__, __PRETTY_FUNCTION__, 1) +#define ao2_alloc(data_size, destructor_fn) __ao2_alloc_debug((data_size), (destructor_fn), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, 1) + +#elif defined(__AST_DEBUG_MALLOC) + +#define ao2_t_alloc(data_size, destructor_fn, debug_msg) __ao2_alloc_debug((data_size), (destructor_fn), (debug_msg), __FILE__, __LINE__, __PRETTY_FUNCTION__, 0) +#define ao2_alloc(data_size, destructor_fn) __ao2_alloc_debug((data_size), (destructor_fn), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, 0) #else @@ -414,7 +419,8 @@ typedef void (*ao2_destructor_fn)(void *); #endif -void *__ao2_alloc_debug(const size_t data_size, ao2_destructor_fn destructor_fn, char *tag, char *file, int line, const char *funcname); +void *__ao2_alloc_debug(const size_t data_size, ao2_destructor_fn destructor_fn, char *tag, + const char *file, int line, const char *funcname, int ref_debug); void *__ao2_alloc(const size_t data_size, ao2_destructor_fn destructor_fn); /*! @} */ @@ -698,10 +704,15 @@ struct ao2_container; * destructor is set implicitly. */ -#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC) +#if defined(REF_DEBUG) + +#define ao2_t_container_alloc(arg1,arg2,arg3,arg4) __ao2_container_alloc_debug((arg1), (arg2), (arg3), (arg4), __FILE__, __LINE__, __PRETTY_FUNCTION__, 1) +#define ao2_container_alloc(arg1,arg2,arg3) __ao2_container_alloc_debug((arg1), (arg2), (arg3), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, 1) + +#elif defined(__AST_DEBUG_MALLOC) -#define ao2_t_container_alloc(arg1,arg2,arg3,arg4) __ao2_container_alloc_debug((arg1), (arg2), (arg3), (arg4), __FILE__, __LINE__, __PRETTY_FUNCTION__) -#define ao2_container_alloc(arg1,arg2,arg3) __ao2_container_alloc_debug((arg1), (arg2), (arg3), "", __FILE__, __LINE__, __PRETTY_FUNCTION__) +#define ao2_t_container_alloc(arg1,arg2,arg3,arg4) __ao2_container_alloc_debug((arg1), (arg2), (arg3), (arg4), __FILE__, __LINE__, __PRETTY_FUNCTION__, 0) +#define ao2_container_alloc(arg1,arg2,arg3) __ao2_container_alloc_debug((arg1), (arg2), (arg3), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, 0) #else @@ -714,7 +725,8 @@ struct ao2_container *__ao2_container_alloc(const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn); 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); + char *tag, char *file, int line, const char *funcname, + int ref_debug); /*! \brief * Returns the number of elements in a container. diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index ad0e2ec4a..a3f979b81 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -854,7 +854,7 @@ enum channelreloadreason { * \deprecated You should use the ast_datastore_alloc() generic function instead. * \version 1.6.1 deprecated */ -struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid) +struct ast_datastore * attribute_malloc ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid) __attribute__((deprecated)); /*! @@ -913,7 +913,16 @@ int ast_setstate(struct ast_channel *chan, enum ast_channel_state); * \note By default, new channels are set to the "s" extension * and "default" context. */ -struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_num, const char *cid_name, const char *acctcode, const char *exten, const char *context, const int amaflag, const char *name_fmt, ...) __attribute__((format(printf, 9, 10))); +struct ast_channel * attribute_malloc __attribute__((format(printf, 12, 13))) + __ast_channel_alloc(int needqueue, int state, const char *cid_num, + const char *cid_name, const char *acctcode, + const char *exten, const char *context, + const int amaflag, const char *file, int line, + const char *function, const char *name_fmt, ...); + +#define ast_channel_alloc(needqueue, state, cid_num, cid_name, acctcode, exten, context, amaflag, ...) \ + __ast_channel_alloc(needqueue, state, cid_num, cid_name, acctcode, exten, context, amaflag, \ + __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) /*! * \brief Queue an outgoing frame diff --git a/include/asterisk/datastore.h b/include/asterisk/datastore.h index 6da1bd0bb..5f7e52348 100644 --- a/include/asterisk/datastore.h +++ b/include/asterisk/datastore.h @@ -65,7 +65,10 @@ struct ast_datastore { * \param[in] uid unique identifer * \version 1.6.1 moved here and renamed from ast_channel_datastore_alloc */ -struct ast_datastore *ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid); +struct ast_datastore * attribute_malloc __ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid, + const char *file, int line, const char *function); + +#define ast_datastore_alloc(info, uid) __ast_datastore_alloc(info, uid, __FILE__, __LINE__, __PRETTY_FUNCTION__) /*! * \brief Free a data store object -- cgit v1.2.3