From d9380e3ece9e48a16e765f7f7db99edaaa1abcf1 Mon Sep 17 00:00:00 2001
From: Kinsey Moore <kmoore@digium.com>
Date: Tue, 20 Aug 2013 15:27:16 +0000
Subject: [PATCH] Unregister CLI commands on exit
This patch ensures that CLI commands enabled by DEBUG_FD_LEAKS and
DEBUG_THREADLOCALS are cleaned up properly on exit.
(closes issue ASTERISK-22238)
Reported by: Corey Farrell
Tested by: Corey Farrell
Patches:
debug_cli_unregister.patch uploaded by Corey Farrell
........
Merged revisions 397106 from http://svn.asterisk.org/svn/asterisk/branches/1.8
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@397107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/astfd.c | 6 ++++++
main/threadstorage.c | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/main/astfd.c b/main/astfd.c
index 79094840d6..b2dfd12ee6 100644
--- a/main/astfd.c
+++ b/main/astfd.c
@@ -274,8 +274,14 @@ static char *handle_show_fd(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
static struct ast_cli_entry cli_show_fd = AST_CLI_DEFINE(handle_show_fd, "Show open file descriptors");
+static void fd_shutdown(void)
+{
+ ast_cli_unregister(&cli_show_fd);
+}
+
int ast_fd_init(void)
{
+ ast_register_atexit(fd_shutdown);
return ast_cli_register(&cli_show_fd);
}
diff --git a/main/threadstorage.c b/main/threadstorage.c
index c89d1078d0..349cb4ecdf 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -249,10 +249,16 @@ static struct ast_cli_entry cli[] = {
AST_CLI_DEFINE(handle_cli_threadstorage_show_summary, "Summarize outstanding memory allocations")
};
+static void threadstorage_shutdown(void)
+{
+ ast_cli_unregister_multiple(cli, ARRAY_LEN(cli));
+}
+
void threadstorage_init(void)
{
pthread_mutex_init(&threadstoragelock, NULL);
ast_cli_register_multiple(cli, ARRAY_LEN(cli));
+ ast_register_atexit(threadstorage_shutdown);
}
#endif /* !defined(DEBUG_THREADLOCALS) */
--
GitLab