[svn-commits] russell: branch russell/events r121406 - in /team/russell/events: ./ main/

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jun  9 19:45:11 2008
New Revision: 121406

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121406
Log:
sync with trunk

Modified:
    team/russell/events/   (props changed)
    team/russell/events/main/taskprocessor.c

Propchange: team/russell/events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun  9 19:45:11 2008
@@ -1,1 +1,1 @@
-/trunk:1-121399
+/trunk:1-121405

Modified: team/russell/events/main/taskprocessor.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/main/taskprocessor.c?view=diff&rev=121406&r1=121405&r2=121406
==============================================================================
--- team/russell/events/main/taskprocessor.c (original)
+++ team/russell/events/main/taskprocessor.c Mon Jun  9 19:45:11 2008
@@ -23,7 +23,11 @@
  */
 
 #include "asterisk.h"
+
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <signal.h>
+#include <sys/time.h>
 
 #include "asterisk/_private.h"
 #include "asterisk/module.h"
@@ -31,8 +35,6 @@
 #include "asterisk/astobj2.h"
 #include "asterisk/cli.h"
 #include "asterisk/taskprocessor.h"
-#include "signal.h"
-#include "sys/time.h"
 
 
 /*! \brief tps_task structure is queued to a taskprocessor
@@ -84,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);
@@ -122,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;
 }