From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 10 Jun 2008 00:31:30 +0000 (+0000)
Subject: Properly initialize the cli_ping condition and lock
X-Git-Tag: 1.6.2.0-beta1~2046
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a886b6e5e691e494e1cdfb452c049f7b489da5bd;p=thirdparty%2Fasterisk.git

Properly initialize the cli_ping condition and lock


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index c39df70385..682327afde 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -86,8 +86,9 @@ static struct ao2_container *tps_singletons;
 
 /*! \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 @@ int ast_tps_init(void)
 		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;
 }