diff options
| author | Corey Farrell <git@cfware.com> | 2015-03-13 01:12:35 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-03-13 01:12:35 +0000 |
| commit | c08fd275bf8c45dc09084f104521cbff04eab25b (patch) | |
| tree | 09cc14b9a9190254980ec88b981d6f561ec8a9b5 /main/bridge_basic.c | |
| parent | 38ee441ea7debef3ebf6b162fc290b121fa3588d (diff) | |
Logger: Convert 'struct ast_callid' to unsigned int.
Switch logger callid's from AO2 objects to simple integers.
This helps in two ways. Copying integers is faster than
referencing AO2 objects, so this will result in a small
reduction in logger overhead. This also erases the possibility
of an infinate loop caused by an invalid callid in
threadstorage.
ASTERISK-24833 #comment Committed callid conversion to trunk.
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4466/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge_basic.c')
| -rw-r--r-- | main/bridge_basic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/bridge_basic.c b/main/bridge_basic.c index e3318b9f2..522a7d40c 100644 --- a/main/bridge_basic.c +++ b/main/bridge_basic.c @@ -2367,12 +2367,11 @@ static void recall_callback(struct ast_dial *dial) */ static void common_recall_channel_setup(struct ast_channel *recall, struct ast_channel *transferer) { - struct ast_callid *callid; + ast_callid callid; callid = ast_read_threadstorage_callid(); if (callid) { ast_channel_callid_set(recall, callid); - ast_callid_unref(callid); } ast_channel_inherit_variables(transferer, recall); @@ -2973,7 +2972,7 @@ static enum attended_transfer_stimulus wait_for_stimulus(struct attended_transfe static void *attended_transfer_monitor_thread(void *data) { struct attended_transfer_properties *props = data; - struct ast_callid *callid; + ast_callid callid; /* * Set thread callid to the transferer's callid because we @@ -3018,7 +3017,6 @@ static void *attended_transfer_monitor_thread(void *data) attended_transfer_properties_shutdown(props); if (callid) { - ast_callid_unref(callid); ast_callid_threadassoc_remove(); } |