[asterisk-commits] russell: trunk r121402 - /trunk/main/taskprocessor.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jun  9 19:31:30 2008
New Revision: 121402

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121402
Log:
Properly initialize the cli_ping condition and lock

Modified:
    trunk/main/taskprocessor.c

Modified: trunk/main/taskprocessor.c
URL: http://svn.digium.com/view/asterisk/trunk/main/taskprocessor.c?view=diff&rev=121402&r1=121401&r2=121402
==============================================================================
--- trunk/main/taskprocessor.c (original)
+++ trunk/main/taskprocessor.c Mon Jun  9 19:31:30 2008
@@ -86,8 +86,9 @@
 
 /*! \brief CLI 'taskprocessor ping <blah>' operation requires a ping condition */
 static ast_cond_t cli_ping_cond;
+
 /*! \brief CLI 'taskprocessor ping <blah>' operation requires a ping condition lock */
-static ast_mutex_t cli_ping_cond_lock;
+AST_MUTEX_DEFINE_STATIC(cli_ping_cond_lock);
 
 /*! \brief The astobj2 hash callback for taskprocessors */
 static int tps_hash_cb(const void *obj, const int flags);
@@ -124,6 +125,9 @@
 		ast_log(LOG_ERROR, "taskprocessor container failed to initialize!\n");
 		return -1;
 	}
+
+	ast_cond_init(&cli_ping_cond, NULL);
+
 	ast_cli_register_multiple(taskprocessor_clis, ARRAY_LEN(taskprocessor_clis));
 	return 0;
 }