diff options
| author | Automerge script <automerge@asterisk.org> | 2013-01-16 18:20:38 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2013-01-16 18:20:38 +0000 |
| commit | 108f5cc5991a774d255c5168a7764a337e1f77d4 (patch) | |
| tree | dcb0f3a55d6b42c2dba59543bda802f265ddf8d6 /main | |
| parent | 70d22f2ab7e606cc3714e50d14a6ee6929800353 (diff) | |
Merged revisions 379229,379231,379233 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r379229 | mjordan | 2013-01-16 11:46:15 -0600 (Wed, 16 Jan 2013) | 10 lines
Let documentation reference links specify which module they're linking to
Again, since res_jabber/res_xmpp have duplicate APIs, their documentation ref
links have to specify which reference they're referring to. The various
documentation parsers can interpret the module attribute however they want
in order to construct the appropriate links.
........
Merged revisions 379228 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r379231 | rmudgett | 2013-01-16 11:49:52 -0600 (Wed, 16 Jan 2013) | 10 lines
chan_misdn: Fix compile error.
(issue ASTERISK-15456)
........
Merged revisions 379226 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 379230 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r379233 | rmudgett | 2013-01-16 12:09:28 -0600 (Wed, 16 Jan 2013) | 8 lines
Reduce call-id logging resource usage.
Since there is no need for the call-id logging ao2 object to have a lock,
don't create it with one.
........
Merged revisions 379232 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/logger.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/logger.c b/main/logger.c index b4069605d..3caea6cc5 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1306,16 +1306,14 @@ void ast_callid_strnprint(char *buffer, size_t buffer_size, struct ast_callid *c struct ast_callid *ast_create_callid(void) { struct ast_callid *call; - int using; - if (!(call = ao2_alloc(sizeof(struct ast_callid), NULL))) { + call = ao2_alloc_options(sizeof(struct ast_callid), NULL, AO2_ALLOC_OPT_LOCK_NOLOCK); + if (!call) { ast_log(LOG_ERROR, "Could not allocate callid struct.\n"); return NULL; } - using = ast_atomic_fetchadd_int(&next_unique_callid, +1); - - call->call_identifier = using; + call->call_identifier = ast_atomic_fetchadd_int(&next_unique_callid, +1); ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", call->call_identifier); return call; } |