diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-09-21 15:15:12 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-21 15:15:12 -0500 |
commit | c526e3d94c85bf7d523bd5c65e8184baed0c9803 (patch) | |
tree | 1f7c335b24c5ef18c3ddf3f01d92178c0eb513ad /main | |
parent | 79070e486d44ac48ff4bed9771c26f69fee9dab5 (diff) | |
parent | 1a7d39818f4837de81ab0b3b587e5bc1fb61816d (diff) |
Merge "logger: Simplify ast_callid handling code." into 14
Diffstat (limited to 'main')
-rw-r--r-- | main/logger.c | 51 |
1 files changed, 11 insertions, 40 deletions
diff --git a/main/logger.c b/main/logger.c index 315de9f23..0c839ffee 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1764,13 +1764,7 @@ void ast_callid_strnprint(char *buffer, size_t buffer_size, ast_callid callid) ast_callid ast_create_callid(void) { - ast_callid call; - - call = ast_atomic_fetchadd_int(&next_unique_callid, +1); -#ifdef TEST_FRAMEWORK - ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", call); -#endif - return call; + return ast_atomic_fetchadd_int(&next_unique_callid, +1); } ast_callid ast_read_threadstorage_callid(void) @@ -1780,7 +1774,6 @@ ast_callid ast_read_threadstorage_callid(void) callid = ast_threadstorage_get(&unique_callid, sizeof(*callid)); return callid ? *callid : 0; - } int ast_callid_threadassoc_change(ast_callid callid) @@ -1788,23 +1781,10 @@ int ast_callid_threadassoc_change(ast_callid callid) ast_callid *id = ast_threadstorage_get(&unique_callid, sizeof(*id)); if (!id) { - ast_log(LOG_ERROR, "Failed to allocate thread storage.\n"); return -1; } - if (*id && (*id != callid)) { -#ifdef TEST_FRAMEWORK - ast_debug(3, "CALL_ID [C-%08x] being removed from thread.\n", *id); -#endif - *id = 0; - } - - if (!(*id) && callid) { - *id = callid; -#ifdef TEST_FRAMEWORK - ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid); -#endif - } + *id = callid; return 0; } @@ -1814,21 +1794,17 @@ int ast_callid_threadassoc_add(ast_callid callid) ast_callid *pointing; pointing = ast_threadstorage_get(&unique_callid, sizeof(*pointing)); - if (!(pointing)) { - ast_log(LOG_ERROR, "Failed to allocate thread storage.\n"); + if (!pointing) { return -1; } - if (!(*pointing)) { - *pointing = callid; -#ifdef TEST_FRAMEWORK - ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid); -#endif - } else { - ast_log(LOG_WARNING, "Attempted to ast_callid_threadassoc_add on thread already associated with a callid.\n"); + if (*pointing) { + ast_log(LOG_ERROR, "ast_callid_threadassoc_add(C-%08x) on thread " + "already associated with callid [C-%08x].\n", callid, *pointing); return 1; } + *pointing = callid; return 0; } @@ -1837,21 +1813,16 @@ int ast_callid_threadassoc_remove(void) ast_callid *pointing; pointing = ast_threadstorage_get(&unique_callid, sizeof(*pointing)); - if (!(pointing)) { - ast_log(LOG_ERROR, "Failed to allocate thread storage.\n"); + if (!pointing) { return -1; } - if (!(*pointing)) { - ast_log(LOG_ERROR, "Tried to clean callid thread storage with no callid in thread storage.\n"); - return -1; - } else { -#ifdef TEST_FRAMEWORK - ast_debug(3, "CALL_ID [C-%08x] being removed from thread.\n", *pointing); -#endif + if (*pointing) { *pointing = 0; return 0; } + + return -1; } int ast_callid_threadstorage_auto(ast_callid *callid) |