kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix checks for allocation debugging.

Browse Source 
MALLOC_DEBUG should not be used to check if debugging is actually
enabled, __AST_DEBUG_MALLOC should be used instead.  MALLOC_DEBUG only
indicates that debugging is requested, __AST_DEBUG_MALLOC indicates it
is active.

Change-Id: I3ce9cdb6ec91b74ee1302941328462231be1ea53
This commit is contained in:
Corey Farrell
2016-08-24 11:02:18 -05:00
parent 415f95ed00
commit a8b3d8d7f9
10 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/chanvars.c
+2 -2
View File
@@ -35,7 +35,7 @@ ASTERISK_REGISTER_FILE()
#include "asterisk/strings.h"
#include "asterisk/utils.h"
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
struct ast_var_t *_ast_var_assign(const char *name, const char *value, const char *file, int lineno, const char *function)
#else
struct ast_var_t *ast_var_assign(const char *name, const char *value)
@@ -45,7 +45,7 @@ struct ast_var_t *ast_var_assign(const char *name, const char *value)
int name_len = strlen(name) + 1;
int value_len = strlen(value) + 1;
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
if (!(var = __ast_calloc(sizeof(*var) + name_len + value_len, sizeof(char), file, lineno, function))) {
#else
if (!(var = ast_calloc(sizeof(*var) + name_len + value_len, sizeof(char)))) {
main/config.c
+2 -2
View File
@@ -283,7 +283,7 @@ struct ast_config_include {
static void ast_variable_destroy(struct ast_variable *doomed);
static void ast_includes_destroy(struct ast_config_include *incls);
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
struct ast_variable *_ast_variable_new(const char *name, const char *value, const char *filename, const char *file, const char *func, int lineno)
#else
struct ast_variable *ast_variable_new(const char *name, const char *value, const char *filename)
@@ -300,7 +300,7 @@ struct ast_variable *ast_variable_new(const char *name, const char *value, const
}
if (
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
(variable = __ast_calloc(1, fn_len + name_len + val_len + sizeof(*variable), file, lineno, func))
#else
(variable = ast_calloc(1, fn_len + name_len + val_len + sizeof(*variable)))
main/hashtab.c
+20 -20
View File
@@ -44,7 +44,7 @@ ASTERISK_REGISTER_FILE()
#include "asterisk/hashtab.h"
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
static void _ast_hashtab_resize(struct ast_hashtab *tab, const char *file, int lineno, const char *func);
#define ast_hashtab_resize(a) _ast_hashtab_resize(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
#else
@@ -219,7 +219,7 @@ unsigned int ast_hashtab_hash_short(const short x)
}
struct ast_hashtab *
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
_ast_hashtab_create
#else
ast_hashtab_create
@@ -230,14 +230,14 @@ ast_hashtab_create
int (*newsize)(struct ast_hashtab *tab),
unsigned int (*hash)(const void *obj),
int do_locking
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
, const char *file, int lineno, const char *function
#endif
)
{
struct ast_hashtab *ht;
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
if (!(ht = __ast_calloc(1, sizeof(*ht), file, lineno, function)))
#else
if (!(ht = ast_calloc(1, sizeof(*ht))))
@@ -247,7 +247,7 @@ ast_hashtab_create
while (!ast_is_prime(initial_buckets)) /* make sure this is prime */
initial_buckets++;
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
if (!(ht->array = __ast_calloc(initial_buckets, sizeof(*(ht->array)), file, lineno, function))) {
#else
if (!(ht->array = ast_calloc(initial_buckets, sizeof(*(ht->array))))) {
@@ -275,7 +275,7 @@ ast_hashtab_create
return ht;
}
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
struct ast_hashtab *_ast_hashtab_dup(struct ast_hashtab *tab, void *(*obj_dup_func)(const void *obj), const char *file, int lineno, const char *func)
#else
struct ast_hashtab *ast_hashtab_dup(struct ast_hashtab *tab, void *(*obj_dup_func)(const void *obj))
@@ -288,7 +288,7 @@ struct ast_hashtab *ast_hashtab_dup(struct ast_hashtab *tab, void *(*obj_dup_fun
return NULL;
if (!(ht->array =
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(tab->hash_tab_size, sizeof(*(ht->array)), file, lineno, func)
#else
ast_calloc(tab->hash_tab_size, sizeof(*(ht->array)))
@@ -316,7 +316,7 @@ struct ast_hashtab *ast_hashtab_dup(struct ast_hashtab *tab, void *(*obj_dup_fun
while (b) {
void *newobj = (*obj_dup_func)(b->object);
if (newobj)
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
_ast_hashtab_insert_immediate_bucket(ht, newobj, i, file, lineno, func);
#else
ast_hashtab_insert_immediate_bucket(ht, newobj, i);
@@ -427,7 +427,7 @@ void ast_hashtab_destroy(struct ast_hashtab *tab, void (*objdestroyfunc)(void *o
}
}
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
int _ast_hashtab_insert_immediate(struct ast_hashtab *tab, const void *obj, const char *file, int lineno, const char *func)
#else
int ast_hashtab_insert_immediate(struct ast_hashtab *tab, const void *obj)
@@ -444,7 +444,7 @@ int ast_hashtab_insert_immediate(struct ast_hashtab *tab, const void *obj)
h = (*tab->hash)(obj) % tab->hash_tab_size;
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
res = _ast_hashtab_insert_immediate_bucket(tab, obj, h, file, lineno, func);
#else
res = ast_hashtab_insert_immediate_bucket(tab, obj, h);
@@ -456,7 +456,7 @@ int ast_hashtab_insert_immediate(struct ast_hashtab *tab, const void *obj)
return res;
}
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
int _ast_hashtab_insert_immediate_bucket(struct ast_hashtab *tab, const void *obj, unsigned int h, const char *file, int lineno, const char *func)
#else
int ast_hashtab_insert_immediate_bucket(struct ast_hashtab *tab, const void *obj, unsigned int h)
@@ -475,7 +475,7 @@ int ast_hashtab_insert_immediate_bucket(struct ast_hashtab *tab, const void *obj
tab->largest_bucket_size = c + 1;
if (!(b =
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(1, sizeof(*b), file, lineno, func)
#else
ast_calloc(1, sizeof(*b))
@@ -498,7 +498,7 @@ int ast_hashtab_insert_immediate_bucket(struct ast_hashtab *tab, const void *obj
return 1;
}
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
int _ast_hashtab_insert_safe(struct ast_hashtab *tab, const void *obj, const char *file, int lineno, const char *func)
#else
int ast_hashtab_insert_safe(struct ast_hashtab *tab, const void *obj)
@@ -514,7 +514,7 @@ int ast_hashtab_insert_safe(struct ast_hashtab *tab, const void *obj)
ast_rwlock_wrlock(&tab->lock);
if (!ast_hashtab_lookup_bucket(tab, obj, &bucket)) {
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
int ret2 = _ast_hashtab_insert_immediate_bucket(tab, obj, bucket, file, lineno, func);
#else
int ret2 = ast_hashtab_insert_immediate_bucket(tab, obj, bucket);
@@ -637,7 +637,7 @@ int ast_hashtab_capacity( struct ast_hashtab *tab)
/* the insert operation calls this, and is wrlock'd when it does. */
/* if you want to call it, you should set the wrlock yourself */
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
static void _ast_hashtab_resize(struct ast_hashtab *tab, const char *file, int lineno, const char *func)
#else
static void ast_hashtab_resize(struct ast_hashtab *tab)
@@ -660,7 +660,7 @@ static void ast_hashtab_resize(struct ast_hashtab *tab)
}
free(tab->array);
if (!(tab->array =
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(newsize, sizeof(*(tab->array)), file, lineno, func)
#else
ast_calloc(newsize, sizeof(*(tab->array)))
@@ -691,7 +691,7 @@ static void ast_hashtab_resize(struct ast_hashtab *tab)
}
}
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
struct ast_hashtab_iter *_ast_hashtab_start_traversal(struct ast_hashtab *tab, const char *file, int lineno, const char *func)
#else
struct ast_hashtab_iter *ast_hashtab_start_traversal(struct ast_hashtab *tab)
@@ -701,7 +701,7 @@ struct ast_hashtab_iter *ast_hashtab_start_traversal(struct ast_hashtab *tab)
struct ast_hashtab_iter *it;
if (!(it =
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(1, sizeof(*it), file, lineno, func)
#else
ast_calloc(1, sizeof(*it))
@@ -718,7 +718,7 @@ struct ast_hashtab_iter *ast_hashtab_start_traversal(struct ast_hashtab *tab)
}
/* use this function to get a write lock */
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
struct ast_hashtab_iter *_ast_hashtab_start_write_traversal(struct ast_hashtab *tab, const char *file, int lineno, const char *func)
#else
struct ast_hashtab_iter *ast_hashtab_start_write_traversal(struct ast_hashtab *tab)
@@ -728,7 +728,7 @@ struct ast_hashtab_iter *ast_hashtab_start_write_traversal(struct ast_hashtab *t
struct ast_hashtab_iter *it;
if (!(it =
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(1, sizeof(*it), file, lineno, func)
#else
ast_calloc(1, sizeof(*it))
main/heap.c
+7 -7
View File
@@ -111,7 +111,7 @@ int ast_heap_verify(struct ast_heap *h)
return 0;
}
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
struct ast_heap *_ast_heap_create(unsigned int init_height, ast_heap_cmp_fn cmp_fn,
ssize_t index_offset, const char *file, int lineno, const char *func)
#else
@@ -131,7 +131,7 @@ struct ast_heap *ast_heap_create(unsigned int init_height, ast_heap_cmp_fn cmp_f
}
if (!(h =
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(1, sizeof(*h), file, lineno, func)
#else
ast_calloc(1, sizeof(*h))
@@ -145,7 +145,7 @@ struct ast_heap *ast_heap_create(unsigned int init_height, ast_heap_cmp_fn cmp_f
h->avail_len = (1 << init_height) - 1;
if (!(h->heap =
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
__ast_calloc(1, h->avail_len * sizeof(void *), file, lineno, func)
#else
ast_calloc(1, h->avail_len * sizeof(void *))
@@ -176,7 +176,7 @@ struct ast_heap *ast_heap_destroy(struct ast_heap *h)
* \brief Add a row of additional storage for the heap.
*/
static int grow_heap(struct ast_heap *h
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
, const char *file, int lineno, const char *func
#endif
)
@@ -184,7 +184,7 @@ static int grow_heap(struct ast_heap *h
void **new_heap;
size_t new_len = h->avail_len * 2 + 1;
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
new_heap = __ast_realloc(h->heap, new_len * sizeof(void *), file, lineno, func);
#else
new_heap = ast_realloc(h->heap, new_len * sizeof(void *));
@@ -244,14 +244,14 @@ static int bubble_up(struct ast_heap *h, int i)
return i;
}
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
int _ast_heap_push(struct ast_heap *h, void *elm, const char *file, int lineno, const char *func)
#else
int ast_heap_push(struct ast_heap *h, void *elm)
#endif
{
if (h->cur_len == h->avail_len && grow_heap(h
#ifdef MALLOC_DEBUG
#ifdef __AST_DEBUG_MALLOC
, file, lineno, func
#endif
)) {
main/strings.c
+2 -2
View File
@@ -53,7 +53,7 @@ ASTERISK_REGISTER_FILE()
* ast_str_append_va(...)
*/
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
int __ast_debug_str_helper(struct ast_str **buf, ssize_t max_len,
int append, const char *fmt, va_list ap, const char *file, int lineno, const char *function)
#else
@@ -112,7 +112,7 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
}
if (
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
#ifdef __AST_DEBUG_MALLOC
_ast_str_make_space(buf, need, file, lineno, function)
#else
ast_str_make_space(buf, need)