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/core_local.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/core_local.c')
| -rw-r--r-- | main/core_local.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/main/core_local.c b/main/core_local.c index 54915ecfe..934cf86bf 100644 --- a/main/core_local.c +++ b/main/core_local.c @@ -885,7 +885,7 @@ static struct ast_channel *local_request(const char *type, struct ast_format_cap { struct local_pvt *p; struct ast_channel *chan; - struct ast_callid *callid; + ast_callid callid; /* Allocate a new private structure and then Asterisk channels */ p = local_alloc(data, cap); @@ -898,9 +898,6 @@ static struct ast_channel *local_request(const char *type, struct ast_format_cap if (chan) { ao2_link(locals, p); } - if (callid) { - ast_callid_unref(callid); - } ao2_ref(p, -1); /* kill the ref from the alloc */ return chan; |