[svn-commits] rmudgett: trunk r377707 - in /trunk: ./ main/dnsmgr.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Dec 10 18:37:01 2012
New Revision: 377707

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377707
Log:
Cleanup dnsmgr on exit.

* Cleanup dnsmgr thread and CLI commands on exit.

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

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

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

Merged revisions 377706 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/dnsmgr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/dnsmgr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dnsmgr.c?view=diff&rev=377707&r1=377706&r2=377707
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Mon Dec 10 18:37:01 2012
@@ -408,6 +408,26 @@
 static struct ast_cli_entry cli_refresh = AST_CLI_DEFINE(handle_cli_refresh, "Performs an immediate refresh");
 static struct ast_cli_entry cli_status = AST_CLI_DEFINE(handle_cli_status, "Display the DNS manager status");
 
+static void dnsmgr_shutdown(void)
+{
+	ast_cli_unregister(&cli_reload);
+	ast_cli_unregister(&cli_status);
+	ast_cli_unregister(&cli_refresh);
+
+	/* Destroy refresh thread. */
+	ast_mutex_lock(&refresh_lock);
+	if (refresh_thread != AST_PTHREADT_NULL) {
+		/* wake up the thread so it will exit */
+		pthread_cancel(refresh_thread);
+		pthread_kill(refresh_thread, SIGURG);
+		pthread_join(refresh_thread, NULL);
+		refresh_thread = AST_PTHREADT_NULL;
+	}
+	ast_mutex_unlock(&refresh_lock);
+
+	ast_sched_context_destroy(sched);
+}
+
 int dnsmgr_init(void)
 {
 	if (!(sched = ast_sched_context_create())) {
@@ -417,6 +437,9 @@
 	ast_cli_register(&cli_reload);
 	ast_cli_register(&cli_status);
 	ast_cli_register(&cli_refresh);
+
+	ast_register_atexit(dnsmgr_shutdown);
+
 	return do_reload(1);
 }