From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 11 Dec 2012 20:45:02 +0000 (+0000)
Subject: Cleanup taskprocessor on exit.
X-Git-Tag: 11.3.0-rc1~3^2~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=920da001d8516fff6dce7f14ae28c080fb531c56;p=thirdparty%2Fasterisk.git

Cleanup taskprocessor on exit.

* Cleanup CLI commands on exit.

(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
      taskprocessor-cleanup-1_8-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
      taskprocessor-cleanup-10-only.patch (license #5909) patch uploaded by Corey Farrell
      Modified
........

Merged revisions 377837 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 377838 from http://svn.asterisk.org/svn/asterisk/branches/10


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

diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 912f891b17..d8f1af3e84 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -122,10 +122,15 @@ static struct ast_cli_entry taskprocessor_clis[] = {
 	AST_CLI_DEFINE(cli_tps_report, "List instantiated task processors and statistics"),
 };
 
-/*! \internal \brief Clean up resources on Asterisk shutdown */
+/*!
+ * \internal
+ * \brief Clean up resources on Asterisk shutdown
+ */
 static void tps_shutdown(void)
 {
+	ast_cli_unregister_multiple(taskprocessor_clis, ARRAY_LEN(taskprocessor_clis));
 	ao2_t_ref(tps_singletons, -1, "Unref tps_singletons in shutdown");
+	tps_singletons = NULL;
 }
 
 /* initialize the taskprocessor container and register CLI operations */