diff options
| -rw-r--r-- | include/asterisk/logger.h | 9 | ||||
| -rw-r--r-- | main/autoservice.c | 15 | ||||
| -rw-r--r-- | main/logger.c | 36 |
3 files changed, 52 insertions, 8 deletions
diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h index 4437ee78f..1632291df 100644 --- a/include/asterisk/logger.h +++ b/include/asterisk/logger.h @@ -281,6 +281,15 @@ struct ast_callid *ast_read_threadstorage_callid(void); #define ast_callid_unref(c) ({ ao2_ref(c, -1); (NULL); }) /*! + * \brief Sets what is stored in the thread storage to the given + * callid if it does not match what is already there. + * + * \retval 0 - success + * \retval non-zero - failure + */ +int ast_callid_threadassoc_change(struct ast_callid *callid); + +/*! * \brief Adds a known callid to thread storage of the calling thread * * \retval 0 - success diff --git a/main/autoservice.c b/main/autoservice.c index afbcbd3e0..5b0c722ef 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -77,6 +77,7 @@ static int as_chan_list_state; static void *autoservice_run(void *ign) { + struct ast_callid *callid = NULL; struct ast_frame hangup_frame = { .frametype = AST_FRAME_CONTROL, .subclass.integer = AST_CONTROL_HANGUP, @@ -90,7 +91,6 @@ static void *autoservice_run(void *ign) int i, x = 0, ms = 50; struct ast_frame *f = NULL; struct ast_frame *defer_frame = NULL; - struct ast_callid *callid = NULL; AST_LIST_LOCK(&aslist); @@ -129,9 +129,8 @@ static void *autoservice_run(void *ign) continue; } - if ((callid = ast_channel_callid(chan))) { - ast_callid_threadassoc_add(callid); - } + callid = ast_channel_callid(chan); + ast_callid_threadassoc_change(callid); f = ast_read(chan); @@ -173,11 +172,11 @@ static void *autoservice_run(void *ign) } else if (f) { ast_frfree(f); } + } - if (callid) { - ast_callid_threadassoc_remove(); - callid = ast_callid_unref(callid); - } + if (callid) { + ast_callid_threadassoc_remove(); + callid = ast_callid_unref(callid); } asthread = AST_PTHREADT_NULL; diff --git a/main/logger.c b/main/logger.c index 97a79ecf2..c5b19a67a 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1317,7 +1317,9 @@ struct ast_callid *ast_create_callid(void) } call->call_identifier = ast_atomic_fetchadd_int(&next_unique_callid, +1); +#ifdef TEST_FRAMEWORK ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", call->call_identifier); +#endif return call; } @@ -1334,6 +1336,36 @@ struct ast_callid *ast_read_threadstorage_callid(void) } +int ast_callid_threadassoc_change(struct ast_callid *callid) +{ + struct ast_callid **id = + ast_threadstorage_get(&unique_callid, sizeof(struct ast_callid **)); + + 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)->call_identifier); +#endif + *id = ast_callid_unref(*id); + *id = NULL; + } + + if (!(*id) && callid) { + /* callid will be unreffed at thread destruction */ + ast_callid_ref(callid); + *id = callid; +#ifdef TEST_FRAMEWORK + ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid->call_identifier); +#endif + } + + return 0; +} + int ast_callid_threadassoc_add(struct ast_callid *callid) { struct ast_callid **pointing; @@ -1347,7 +1379,9 @@ int ast_callid_threadassoc_add(struct ast_callid *callid) /* callid will be unreffed at thread destruction */ ast_callid_ref(callid); *pointing = callid; +#ifdef TEST_FRAMEWORK ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid->call_identifier); +#endif } else { ast_log(LOG_WARNING, "Attempted to ast_callid_threadassoc_add on thread already associated with a callid.\n"); return 1; @@ -1369,7 +1403,9 @@ int ast_callid_threadassoc_remove(void) 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)->call_identifier); +#endif *pointing = ast_callid_unref(*pointing); return 0; } |