[asterisk-commits] mmichelson: branch mmichelson/threadpool r377903 - in /team/mmichelson/thread...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Dec 11 16:25:25 CST 2012


Author: mmichelson
Date: Tue Dec 11 16:25:21 2012
New Revision: 377903

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377903
Log:
Reset automerge property.


Modified:
    team/mmichelson/threadpool/   (props changed)
    team/mmichelson/threadpool/main/aoc.c
    team/mmichelson/threadpool/main/cel.c
    team/mmichelson/threadpool/main/channel.c
    team/mmichelson/threadpool/main/data.c
    team/mmichelson/threadpool/main/file.c
    team/mmichelson/threadpool/main/http.c
    team/mmichelson/threadpool/main/image.c
    team/mmichelson/threadpool/main/stun.c
    team/mmichelson/threadpool/main/timing.c

Propchange: team/mmichelson/threadpool/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/threadpool/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/mmichelson/threadpool/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 11 16:25:21 2012
@@ -1,1 +1,1 @@
-/trunk:1-377878
+/trunk:1-377902

Modified: team/mmichelson/threadpool/main/aoc.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/aoc.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/aoc.c (original)
+++ team/mmichelson/threadpool/main/aoc.c Tue Dec 11 16:25:21 2012
@@ -1605,7 +1605,12 @@
 	AST_CLI_DEFINE(aoc_cli_debug_enable, "enable cli debugging of AOC messages"),
 };
 
+static void aoc_shutdown(void)
+{
+	ast_cli_unregister_multiple(aoc_cli, ARRAY_LEN(aoc_cli));
+}
 int ast_aoc_cli_init(void)
 {
+	ast_register_atexit(aoc_shutdown);
 	return ast_cli_register_multiple(aoc_cli, ARRAY_LEN(aoc_cli));
 }

Modified: team/mmichelson/threadpool/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/cel.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/cel.c (original)
+++ team/mmichelson/threadpool/main/cel.c Tue Dec 11 16:25:21 2012
@@ -729,6 +729,7 @@
 		ao2_ref(linkedids, -1);
 		linkedids = NULL;
 	}
+	ast_cli_unregister(&cli_status);
 }
 
 int ast_cel_engine_init(void)

Modified: team/mmichelson/threadpool/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/channel.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/channel.c (original)
+++ team/mmichelson/threadpool/main/channel.c Tue Dec 11 16:25:21 2012
@@ -8620,9 +8620,11 @@
 static void channels_shutdown(void)
 {
 	ast_data_unregister(NULL);
+	ast_cli_unregister_multiple(cli_channel, ARRAY_LEN(cli_channel));
 	if (channels) {
 		ao2_container_unregister("channels");
 		ao2_ref(channels, -1);
+		channels = NULL;
 	}
 }
 

Modified: team/mmichelson/threadpool/main/data.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/data.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/data.c (original)
+++ team/mmichelson/threadpool/main/data.c Tue Dec 11 16:25:21 2012
@@ -3318,7 +3318,9 @@
 static void data_shutdown(void)
 {
 	ast_manager_unregister("DataGet");
+	ast_cli_unregister_multiple(cli_data, ARRAY_LEN(cli_data));
 	ao2_t_ref(root_data.container, -1, "Unref root_data.container in data_shutdown");
+	root_data.container = NULL;
 	ast_rwlock_destroy(&root_data.lock);
 }
 

Modified: team/mmichelson/threadpool/main/file.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/file.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/file.c (original)
+++ team/mmichelson/threadpool/main/file.c Tue Dec 11 16:25:21 2012
@@ -1583,8 +1583,14 @@
 	AST_CLI_DEFINE(handle_cli_core_show_file_formats, "Displays file formats")
 };
 
+static void file_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_file, ARRAY_LEN(cli_file));
+}
+
 int ast_file_init(void)
 {
 	ast_cli_register_multiple(cli_file, ARRAY_LEN(cli_file));
+	ast_register_atexit(file_shutdown);
 	return 0;
 }

Modified: team/mmichelson/threadpool/main/http.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/http.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/http.c (original)
+++ team/mmichelson/threadpool/main/http.c Tue Dec 11 16:25:21 2012
@@ -1203,11 +1203,17 @@
 	AST_CLI_DEFINE(handle_show_http, "Display HTTP server status"),
 };
 
+static void http_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_http, ARRAY_LEN(cli_http));
+}
+
 int ast_http_init(void)
 {
 	ast_http_uri_link(&statusuri);
 	ast_http_uri_link(&staticuri);
 	ast_cli_register_multiple(cli_http, ARRAY_LEN(cli_http));
+	ast_register_atexit(http_shutdown);
 
 	return __ast_http_load(0);
 }

Modified: team/mmichelson/threadpool/main/image.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/image.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/image.c (original)
+++ team/mmichelson/threadpool/main/image.c Tue Dec 11 16:25:21 2012
@@ -206,8 +206,14 @@
 	AST_CLI_DEFINE(handle_core_show_image_formats, "Displays image formats")
 };
 
+static void image_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_image, ARRAY_LEN(cli_image));
+}
+
 int ast_image_init(void)
 {
 	ast_cli_register_multiple(cli_image, ARRAY_LEN(cli_image));
+	ast_register_atexit(image_shutdown);
 	return 0;
 }

Modified: team/mmichelson/threadpool/main/stun.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/stun.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/stun.c (original)
+++ team/mmichelson/threadpool/main/stun.c Tue Dec 11 16:25:21 2012
@@ -504,8 +504,14 @@
 	AST_CLI_DEFINE(handle_cli_stun_set_debug, "Enable/Disable STUN debugging"),
 };
 
+static void stun_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_stun, sizeof(cli_stun) / sizeof(struct ast_cli_entry));
+}
+
 /*! \brief Initialize the STUN system in Asterisk */
 void ast_stun_init(void)
 {
 	ast_cli_register_multiple(cli_stun, sizeof(cli_stun) / sizeof(struct ast_cli_entry));
-}
+	ast_register_atexit(stun_shutdown);
+}

Modified: team/mmichelson/threadpool/main/timing.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/timing.c?view=diff&rev=377903&r1=377902&r2=377903
==============================================================================
--- team/mmichelson/threadpool/main/timing.c (original)
+++ team/mmichelson/threadpool/main/timing.c Tue Dec 11 16:25:21 2012
@@ -299,11 +299,21 @@
 	AST_CLI_DEFINE(timing_test, "Run a timing test"),
 };
 
+static void timing_shutdown(void)
+{
+	ast_cli_unregister_multiple(cli_timing, ARRAY_LEN(cli_timing));
+
+	ast_heap_destroy(timing_interfaces);
+	timing_interfaces = NULL;
+}
+
 int ast_timing_init(void)
 {
 	if (!(timing_interfaces = ast_heap_create(2, timing_holder_cmp, 0))) {
 		return -1;
 	}
 
+	ast_register_atexit(timing_shutdown);
+
 	return ast_cli_register_multiple(cli_timing, ARRAY_LEN(cli_timing));
 }




More information about the asterisk-commits mailing list