kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

astobj2: Add backtrace to log_bad_ao2.

Browse Source 
* Compile __ast_assert_failed unconditionally.
* Use __ast_assert_failed to log messages from log_bad_ao2
* Remove calls to ast_assert(0) that happen after log_bad_ao2 was run.

Change-Id: I48f1af44b2718ad74a421ff75cb6397b924a9751
This commit is contained in:
Corey Farrell
2016-09-16 19:54:07 -04:00
parent 224c295292
commit 2a03575c30
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/astobj2.c
View File

@@ -178,22 +178,17 @@ int internal_is_ao2_object(void *user_data)
void log_bad_ao2(void *user_data, const char *file, int line, const char *func)
{
struct astobj2 *p;
char bad_magic[100];
if (!user_data) {
ast_log(__LOG_ERROR, file, line, func, "user_data is NULL\n");
__ast_assert_failed(0, "user_data is NULL", file, line, func);
return;
}
p = INTERNAL_OBJ(user_data);
if (p->priv_data.magic) {
ast_log(__LOG_ERROR, file, line, func,
"bad magic number 0x%x for object %p\n",
p->priv_data.magic, user_data);
} else {
ast_log(__LOG_ERROR, file, line, func,
"bad magic number for object %p. Object is likely destroyed.\n",
user_data);
}
snprintf(bad_magic, sizeof(bad_magic), "bad magic number 0x%x for object %p",
p->priv_data.magic, user_data);
__ast_assert_failed(0, bad_magic, file, line, func);
}
int __ao2_lock(void *user_data, enum ao2_lock_req lock_how, const char *file, const char *func, int line, const char *var)
@@ -205,7 +200,6 @@ int __ao2_lock(void *user_data, enum ao2_lock_req lock_how, const char *file, co
int res = 0;
if (obj == NULL) {
ast_assert(0);
return -1;
}
@@ -269,7 +263,6 @@ int __ao2_unlock(void *user_data, const char *file, const char *func, int line,
int current_value;
if (obj == NULL) {
ast_assert(0);
return -1;
}
@@ -323,7 +316,6 @@ int __ao2_trylock(void *user_data, enum ao2_lock_req lock_how, const char *file,
int res = 0;
if (obj == NULL) {
ast_assert(0);
return -1;
}
@@ -454,7 +446,6 @@ void *ao2_object_get_lockaddr(void *user_data)
obj = INTERNAL_OBJ_CHECK(user_data);
if (obj == NULL) {
ast_assert(0);
return NULL;
}
@@ -486,7 +477,6 @@ int __ao2_ref(void *user_data, int delta,
user_data, delta, ast_get_tid(), file, line, func, tag ?: "");
fflush(ref_log);
}
ast_assert(0);
return -1;
}