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 c39df7038507388133c5bab51211a14aa8076b69..682327afdeb4d32d9a224e409a4b8210b10fc5c5 100644 (file)
--- 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;
 }