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 /res | |
| 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 'res')
| -rw-r--r-- | res/ari/resource_bridges.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c index 9ae0e9386..bcd27af14 100644 --- a/res/ari/resource_bridges.c +++ b/res/ari/resource_bridges.c @@ -284,8 +284,7 @@ static void *bridge_channel_control_thread(void *data) struct ast_channel *bridge_channel = thread_data->bridge_channel; struct stasis_app_control *control = thread_data->control; struct stasis_forward *forward = thread_data->forward; - - RAII_VAR(struct ast_callid *, callid, ast_channel_callid(bridge_channel), ast_callid_cleanup); + ast_callid callid = ast_channel_callid(bridge_channel); if (callid) { ast_callid_threadassoc_add(callid); |