[asterisk-commits] rmudgett: trunk r379233 - in /trunk: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan 16 12:09:28 2013
New Revision: 379233

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379233
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/logger.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=379233&r1=379232&r2=379233
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Wed Jan 16 12:09:28 2013
@@ -1306,16 +1306,14 @@
 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;
 }