[asterisk-commits] kpfleming: branch 1.6.1 r192354 - in /branches/1.6.1: ./ include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue May 5 07:44:57 CDT 2009
Author: kpfleming
Date: Tue May 5 07:44:54 2009
New Revision: 192354
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192354
Log:
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.
........
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/include/asterisk/astobj2.h
branches/1.6.1/include/asterisk/channel.h
branches/1.6.1/include/asterisk/datastore.h
branches/1.6.1/main/astobj2.c
branches/1.6.1/main/channel.c
branches/1.6.1/main/datastore.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/include/asterisk/astobj2.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/astobj2.h?view=diff&rev=192354&r1=192353&r2=192354
==============================================================================
--- branches/1.6.1/include/asterisk/astobj2.h (original)
+++ branches/1.6.1/include/asterisk/astobj2.h Tue May 5 07:44:54 2009
@@ -399,10 +399,15 @@
* rather, we just call ao2_ref(o, -1);
*/
-#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC)
-
-#define ao2_t_alloc(arg1, arg2, arg3) _ao2_alloc_debug((arg1), (arg2), (arg3), __FILE__, __LINE__, __PRETTY_FUNCTION__)
-#define ao2_alloc(arg1, arg2) _ao2_alloc_debug((arg1), (arg2), "", __FILE__, __LINE__, __PRETTY_FUNCTION__)
+#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__, 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
@@ -411,7 +416,8 @@
#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);
/*! @} */
@@ -682,10 +688,15 @@
* destructor is set implicitly.
*/
-#if defined(REF_DEBUG) || 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__)
+#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__, 0)
+#define ao2_container_alloc(arg1,arg2,arg3) _ao2_container_alloc_debug((arg1), (arg2), (arg3), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, 0)
#else
@@ -698,7 +709,8 @@
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.
Modified: branches/1.6.1/include/asterisk/channel.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/channel.h?view=diff&rev=192354&r1=192353&r2=192354
==============================================================================
--- branches/1.6.1/include/asterisk/channel.h (original)
+++ branches/1.6.1/include/asterisk/channel.h Tue May 5 07:44:54 2009
@@ -652,7 +652,7 @@
* \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));
/*!
@@ -712,7 +712,16 @@
* \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
Modified: branches/1.6.1/include/asterisk/datastore.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/datastore.h?view=diff&rev=192354&r1=192353&r2=192354
==============================================================================
--- branches/1.6.1/include/asterisk/datastore.h (original)
+++ branches/1.6.1/include/asterisk/datastore.h Tue May 5 07:44:54 2009
@@ -65,7 +65,10 @@
* \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
Modified: branches/1.6.1/main/astobj2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/astobj2.c?view=diff&rev=192354&r1=192353&r2=192354
==============================================================================
--- branches/1.6.1/main/astobj2.c (original)
+++ branches/1.6.1/main/astobj2.c Tue May 5 07:44:54 2009
@@ -297,7 +297,7 @@
* 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 @@
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 @@
}
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);
}
Modified: branches/1.6.1/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=192354&r1=192353&r2=192354
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Tue May 5 07:44:54 2009
@@ -766,13 +766,16 @@
};
/*! \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) {
@@ -780,8 +783,15 @@
return NULL;
}
- if (!(tmp = ast_calloc(1, sizeof(*tmp))))
+#if defined(__AST_DEBUG_MALLOC)
+ if (!(tmp = __ast_calloc(1, sizeof(*tmp), file, line, function))) {
return NULL;
+ }
+#else
+ if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
+ return NULL;
+ }
+#endif
if (!(tmp->sched = sched_context_create())) {
ast_log(LOG_WARNING, "Channel allocation failed: Unable to create schedule context\n");
@@ -877,11 +887,7 @@
* 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? */
@@ -953,6 +959,25 @@
}
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 */
@@ -5495,3 +5520,37 @@
return ast_say_digit_str_full(chan, buf, ints, lang, audiofd, ctrlfd);
}
+
+/* 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;
+}
Modified: branches/1.6.1/main/datastore.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/datastore.c?view=diff&rev=192354&r1=192353&r2=192354
==============================================================================
--- branches/1.6.1/main/datastore.c (original)
+++ branches/1.6.1/main/datastore.c Tue May 5 07:44:54 2009
@@ -28,7 +28,8 @@
#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 @@
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 @@
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__);
+}
More information about the asterisk-commits
mailing list