diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/astobj2.c | 27 | ||||
| -rw-r--r-- | main/logger.c | 6 | ||||
| -rw-r--r-- | main/utils.c | 2 |
3 files changed, 7 insertions, 28 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index d2592ecb5..2dd9f0536 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -97,29 +97,6 @@ struct astobj2_rwlock { struct ao2_stats ao2; #endif -#ifdef HAVE_BKTR -#include <execinfo.h> /* for backtrace */ -#endif - -void ao2_bt(void) -{ -#ifdef HAVE_BKTR - int depth; - int idx; -#define N1 20 - void *addresses[N1]; - char **strings; - - depth = backtrace(addresses, N1); - strings = ast_bt_get_symbols(addresses, depth); - ast_verbose("backtrace returned: %d\n", depth); - for (idx = 0; idx < depth; ++idx) { - ast_verbose("%d: %p %s\n", idx, addresses[idx], strings[idx]); - } - ast_std_free(strings); -#endif -} - #define INTERNAL_OBJ_MUTEX(user_data) \ ((struct astobj2_lock *) (((char *) (user_data)) - sizeof(struct astobj2_lock))) @@ -455,6 +432,9 @@ static int internal_ao2_ref(void *user_data, int delta, const char *file, int li if (current_value < 0) { ast_log(__LOG_ERROR, file, line, func, "Invalid refcount %d on ao2 object %p\n", current_value, user_data); + ast_assert(0); + /* stop here even if assert doesn't DO_CRASH */ + return -1; } /* last reference, destroy the object */ @@ -516,7 +496,6 @@ int __ao2_ref_debug(void *user_data, int delta, const char *tag, const char *fil } if (obj == NULL) { - ast_log_backtrace(); ast_assert(0); } diff --git a/main/logger.c b/main/logger.c index 86cd0d4a6..13d074c6d 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1759,14 +1759,14 @@ void ast_log_backtrace(void) } if ((strings = ast_bt_get_symbols(bt->addresses, bt->num_frames))) { - ast_debug(1, "Got %d backtrace record%c\n", bt->num_frames, bt->num_frames != 1 ? 's' : ' '); + ast_verbose("Got %d backtrace record%c\n", bt->num_frames, bt->num_frames != 1 ? 's' : ' '); for (i = 3; i < bt->num_frames - 2; i++) { - ast_debug(1, "#%d: [%p] %s\n", i - 3, bt->addresses[i], strings[i]); + ast_verbose("#%d: [%p] %s\n", i - 3, bt->addresses[i], strings[i]); } ast_std_free(strings); } else { - ast_debug(1, "Could not allocate memory for backtrace\n"); + ast_verbose("Could not allocate memory for backtrace\n"); } ast_bt_destroy(bt); #else diff --git a/main/utils.c b/main/utils.c index b32e71b6c..0097487a3 100644 --- a/main/utils.c +++ b/main/utils.c @@ -2544,7 +2544,7 @@ void __ast_assert_failed(int condition, const char *condition_str, const char *f condition_str, condition, line, function, file); /* Generate a backtrace for the assert */ - ao2_bt(); + ast_log_backtrace(); /* * Give the logger a chance to get the message out, just in case |