[asterisk-commits] dlee: branch dlee/clean-shutdown r388723 - /team/dlee/clean-shutdown/main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue May 14 15:30:01 2013
New Revision: 388723

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388723
Log:
Assert for subscription completion consistently

Modified:
    team/dlee/clean-shutdown/main/stasis.c
    team/dlee/clean-shutdown/main/stasis_cache.c
    team/dlee/clean-shutdown/main/stasis_message_router.c

Modified: team/dlee/clean-shutdown/main/stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/clean-shutdown/main/stasis.c?view=diff&rev=388723&r1=388722&r2=388723
==============================================================================
--- team/dlee/clean-shutdown/main/stasis.c (original)
+++ team/dlee/clean-shutdown/main/stasis.c Tue May 14 15:30:01 2013
@@ -131,6 +131,7 @@
 {
 	struct stasis_subscription *sub = obj;
 	ast_assert(!stasis_subscription_is_subscribed(sub));
+	ast_assert(stasis_subscription_is_done(sub));
 	ao2_cleanup(sub->topic);
 	sub->topic = NULL;
 	ast_taskprocessor_unreference(sub->mailbox);

Modified: team/dlee/clean-shutdown/main/stasis_cache.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/clean-shutdown/main/stasis_cache.c?view=diff&rev=388723&r1=388722&r2=388723
==============================================================================
--- team/dlee/clean-shutdown/main/stasis_cache.c (original)
+++ team/dlee/clean-shutdown/main/stasis_cache.c Tue May 14 15:30:01 2013
@@ -53,6 +53,7 @@
 static void stasis_caching_topic_dtor(void *obj) {
 	struct stasis_caching_topic *caching_topic = obj;
 	ast_assert(!stasis_subscription_is_subscribed(caching_topic->sub));
+	ast_assert(stasis_subscription_is_done(caching_topic->sub));
 	ao2_cleanup(caching_topic->sub);
 	caching_topic->sub = NULL;
 	ao2_cleanup(caching_topic->cache);

Modified: team/dlee/clean-shutdown/main/stasis_message_router.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/clean-shutdown/main/stasis_message_router.c?view=diff&rev=388723&r1=388722&r2=388723
==============================================================================
--- team/dlee/clean-shutdown/main/stasis_message_router.c (original)
+++ team/dlee/clean-shutdown/main/stasis_message_router.c Tue May 14 15:30:01 2013
@@ -74,6 +74,7 @@
 	size_t i;
 
 	ast_assert(!stasis_subscription_is_subscribed(router->subscription));
+	ast_assert(stasis_subscription_is_done(router->subscription));
 	router->subscription = NULL;
 	for (i = 0; i < router->num_routes_current; ++i) {
 		ao2_cleanup(router->routes[i]);