diff options
| -rw-r--r-- | include/asterisk/astobj2.h | 28 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 13 | ||||
| -rw-r--r-- | include/asterisk/datastore.h | 5 | ||||
| -rw-r--r-- | main/astobj2.c | 12 | ||||
| -rw-r--r-- | main/channel.c | 73 | ||||
| -rw-r--r-- | main/datastore.c | 29 |
6 files changed, 134 insertions, 26 deletions
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 diff --git a/main/astobj2.c b/main/astobj2.c index a1e645ff9..81a3982f1 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -302,7 +302,7 @@ static int internal_ao2_ref(void *user_data, const int delta) * We always alloc at least the size of a void *, * for debugging purposes. */ -static void *internal_ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn, char *file, int line, const char *funcname) +static void *internal_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 *internal_ao2_alloc(size_t data_size, ao2_destructor_fn destructor_f 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 = internal_ao2_alloc(data_size, destructor_fn, file, line, funcname); @@ -443,13 +444,14 @@ static struct ao2_container *internal_ao2_container_alloc(struct ao2_container * } 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 */ const unsigned int num_buckets = hash_fn ? n_buckets : 1; size_t container_size = sizeof(struct ao2_container) + num_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 internal_ao2_container_alloc(c, num_buckets, hash_fn, cmp_fn); } diff --git a/main/channel.c b/main/channel.c index bf8b120ec..9839f1921 100644 --- a/main/channel.c +++ b/main/channel.c @@ -779,13 +779,16 @@ static const struct ast_channel_tech null_tech = { static void ast_channel_destructor(void *obj); /*! \brief Create a new channel structure */ -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, ...) +static struct ast_channel * attribute_malloc __attribute__((format(printf, 12, 0))) +__ast_channel_alloc_ap(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, va_list ap1, va_list ap2) { struct ast_channel *tmp; int x; int flags; struct varshead *headp; - va_list ap1, ap2; /* If shutting down, don't allocate any new channels */ if (shutting_down) { @@ -793,9 +796,19 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_ return NULL; } +#if defined(REF_DEBUG) + if (!(tmp = __ao2_alloc_debug(sizeof(*tmp), ast_channel_destructor, "", file, line, function, 1))) { + return NULL; + } +#elif defined(__AST_DEBUG_MALLOC) + if (!(tmp = __ao2_alloc_debug(sizeof(*tmp), ast_channel_destructor, "", file, line, function, 0))) { + return NULL; + } +#else if (!(tmp = ao2_alloc(sizeof(*tmp), ast_channel_destructor))) { return NULL; } +#endif if (!(tmp->sched = sched_context_create())) { ast_log(LOG_WARNING, "Channel allocation failed: Unable to create schedule context\n"); @@ -908,11 +921,7 @@ alertpipe_failed: * uses them to build the string, instead of forming the va_lists internally from the vararg ... list. * This new function was written so this can be accomplished. */ - va_start(ap1, name_fmt); - va_start(ap2, name_fmt); ast_string_field_build_va(tmp, name, name_fmt, ap1, ap2); - va_end(ap1); - va_end(ap2); } /* Reminder for the future: under what conditions do we NOT want to track cdrs on channels? */ @@ -988,6 +997,25 @@ alertpipe_failed: return tmp; } +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 *file, int line, + const char *function, const char *name_fmt, ...) +{ + va_list ap1, ap2; + struct ast_channel *result; + + va_start(ap1, name_fmt); + va_start(ap2, name_fmt); + result = __ast_channel_alloc_ap(needqueue, state, cid_num, cid_name, acctcode, exten, context, + amaflag, file, line, function, name_fmt, ap1, ap2); + va_end(ap1); + va_end(ap2); + + return result; +} + /*! \brief Queue an outgoing media frame */ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, int head) { @@ -6474,3 +6502,36 @@ void ast_channel_queue_redirecting_update(struct ast_channel *chan, const struct ast_queue_control_data(chan, AST_CONTROL_REDIRECTING, data, datalen); } +/* DO NOT PUT ADDITIONAL FUNCTIONS BELOW THIS BOUNDARY + * + * ONLY FUNCTIONS FOR PROVIDING BACKWARDS ABI COMPATIBILITY BELONG HERE + * + */ + +/* Provide binary compatibility for modules that call ast_channel_alloc() directly; + * newly compiled modules will call __ast_channel_alloc() via the macros in channel.h + */ +#undef ast_channel_alloc +struct ast_channel __attribute__((format(printf, 9, 10))) + *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, ...); +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, ...) +{ + va_list ap1, ap2; + struct ast_channel *result; + + + va_start(ap1, name_fmt); + va_start(ap2, name_fmt); + result = __ast_channel_alloc_ap(needqueue, state, cid_num, cid_name, acctcode, exten, context, + amaflag, __FILE__, __LINE__, __FUNCTION__, name_fmt, ap1, ap2); + va_end(ap1); + va_end(ap2); + + return result; +} diff --git a/main/datastore.c b/main/datastore.c index be5479796..3d097860f 100644 --- a/main/datastore.c +++ b/main/datastore.c @@ -28,7 +28,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/datastore.h" #include "asterisk/utils.h" -struct ast_datastore *ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid) +struct ast_datastore *__ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid, + const char *file, int line, const char *function) { struct ast_datastore *datastore = NULL; @@ -37,11 +38,15 @@ struct ast_datastore *ast_datastore_alloc(const struct ast_datastore_info *info, return NULL; } - /* Allocate memory for datastore and clear it */ - datastore = ast_calloc(1, sizeof(*datastore)); - if (!datastore) { +#if defined(__AST_DEBUG_MALLOC) + if (!(datastore = __ast_calloc(1, sizeof(*datastore), file, line, function))) { + return NULL; + } +#else + if (!(datastore = ast_calloc(1, sizeof(*datastore)))) { return NULL; } +#endif datastore->info = info; @@ -71,3 +76,19 @@ int ast_datastore_free(struct ast_datastore *datastore) return res; } + +/* DO NOT PUT ADDITIONAL FUNCTIONS BELOW THIS BOUNDARY + * + * ONLY FUNCTIONS FOR PROVIDING BACKWARDS ABI COMPATIBILITY BELONG HERE + * + */ + +/* Provide binary compatibility for modules that call ast_datastore_alloc() directly; + * newly compiled modules will call __ast_datastore_alloc() via the macros in datastore.h + */ +#undef ast_datastore_alloc +struct ast_datastore *ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid); +struct ast_datastore *ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid) +{ + return __ast_datastore_alloc(info, uid, __FILE__, __LINE__, __FUNCTION__); +} |