[asterisk-commits] rmudgett: branch 11 r377808 - in /branches/11: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Dec 11 14:03:23 2012
New Revision: 377808

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

* Cleanup CLI commands on exit.

* Unreference hints and statecbs containers on exit.

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

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

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

Modified:
    branches/11/   (props changed)
    branches/11/main/pbx.c

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

Modified: branches/11/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/pbx.c?view=diff&rev=377808&r1=377807&r2=377808
==============================================================================
--- branches/11/main/pbx.c (original)
+++ branches/11/main/pbx.c Tue Dec 11 14:03:23 2012
@@ -11746,6 +11746,7 @@
 		ast_unregister_application(builtins[x].name);
 	}
 	ast_manager_unregister("ShowDialPlan");
+	ast_cli_unregister_multiple(pbx_cli, ARRAY_LEN(pbx_cli));
 	ast_custom_function_unregister(&exception_function);
 	ast_custom_function_unregister(&testtime_function);
 	ast_data_unregister(NULL);
@@ -11757,6 +11758,8 @@
 int load_pbx(void)
 {
 	int x;
+
+	ast_register_atexit(unload_pbx);
 
 	/* Initialize the PBX */
 	ast_verb(1, "Asterisk PBX Core Initializing\n");
@@ -11792,7 +11795,6 @@
 		return -1;
 	}
 
-	ast_register_atexit(unload_pbx);
 	return 0;
 }
 
@@ -12153,17 +12155,23 @@
 	return (state_cb->change_cb == change_cb) ? CMP_MATCH | CMP_STOP : 0;
 }
 
-/*! \internal \brief Clean up resources on Asterisk shutdown */
+/*!
+ * \internal
+ * \brief Clean up resources on Asterisk shutdown
+ */
 static void pbx_shutdown(void)
 {
 	if (hints) {
 		ao2_ref(hints, -1);
+		hints = NULL;
 	}
 	if (hintdevices) {
 		ao2_ref(hintdevices, -1);
+		hintdevices = NULL;
 	}
 	if (statecbs) {
 		ao2_ref(statecbs, -1);
+		statecbs = NULL;
 	}
 }
 
@@ -12174,5 +12182,6 @@
 	statecbs = ao2_container_alloc(1, NULL, statecbs_cmp);
 
 	ast_register_atexit(pbx_shutdown);
+
 	return (hints && hintdevices && statecbs) ? 0 : -1;
 }