kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unregister CLI commands on exit

Browse Source 
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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@397106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-08-20 15:26:24 +00:00
parent 4b007c059f
commit ec2f140b3d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/astfd.c
View File

@@ -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);
}

6
main/threadstorage.c
View File

@@ -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) */