kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stopped spamming of debug messages during attended transfer.

Browse Source 
While autoservice is running and servicing a channel the callid is being stored
and removed in the thread's local storage for each iteration of the thread loop.
If debug was set to a sufficient level the log file would be spammed with callid
thread local storage debug messages.

Added a new function that checks to see if the callid to be stored is different
than what is already contained (if anything).  If it is different then
store/replace and log, otherwise just leave as is.  Also made it so all logging
of debug messages pertaining to the callid thread storage outputs only when
TEST_FRAMEWORK is defined.

(issue ASTERISK-21014)
(closes issue ASTERISK-21014)
Report by: Rusty Newton
Review: https://reviewboard.asterisk.org/r/2324/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@381554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2013-02-15 17:17:27 +00:00
parent 120a7cbc03
commit 1595101bb6
3 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
main/logger.c
View File

@@ -1299,7 +1299,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;
}
@@ -1316,6 +1318,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;
@@ -1329,7 +1361,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;
@@ -1351,7 +1385,9 @@ int ast_callid_threadassoc_remove()
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;
}