[asterisk-commits] dlee: branch dlee/stasis-cache-split r395508 - in /team/dlee/stasis-cache-spl...

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Jul 26 11:23:35 2013
New Revision: 395508

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395508
Log:
Hide the underlying devicestate caching topic

Modified:
    team/dlee/stasis-cache-split/include/asterisk/devicestate.h
    team/dlee/stasis-cache-split/main/devicestate.c
    team/dlee/stasis-cache-split/tests/test_devicestate.c

Modified: team/dlee/stasis-cache-split/include/asterisk/devicestate.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/include/asterisk/devicestate.h?view=diff&rev=395508&r1=395507&r2=395508
==============================================================================
--- team/dlee/stasis-cache-split/include/asterisk/devicestate.h (original)
+++ team/dlee/stasis-cache-split/include/asterisk/devicestate.h Fri Jul 26 11:23:35 2013
@@ -307,7 +307,7 @@
  * \retval NULL if it has not been allocated
  * \since 12
  */
-struct stasis_caching_topic *ast_device_state_topic_cached(void);
+struct stasis_topic *ast_device_state_topic_cached(void);
 
 /*!
  * \brief Backend cache for ast_device_state_topic_cached()

Modified: team/dlee/stasis-cache-split/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/main/devicestate.c?view=diff&rev=395508&r1=395507&r2=395508
==============================================================================
--- team/dlee/stasis-cache-split/main/devicestate.c (original)
+++ team/dlee/stasis-cache-split/main/devicestate.c Fri Jul 26 11:23:35 2013
@@ -725,9 +725,9 @@
 	return device_state_cache;
 }
 
-struct stasis_caching_topic *ast_device_state_topic_cached(void)
-{
-	return device_state_topic_cached;
+struct stasis_topic *ast_device_state_topic_cached(void)
+{
+	return stasis_caching_get_topic(device_state_topic_cached);
 }
 
 struct stasis_topic *ast_device_state_topic(const char *device)
@@ -815,7 +815,7 @@
 		return -1;
 	}
 
-	devstate_message_sub = stasis_subscribe(stasis_caching_get_topic(ast_device_state_topic_cached()), devstate_change_collector_cb, NULL);
+	devstate_message_sub = stasis_subscribe(ast_device_state_topic_cached(), devstate_change_collector_cb, NULL);
 
 	if (!devstate_message_sub) {
 		ast_log(LOG_ERROR, "Failed to create subscription for the device state change collector\n");

Modified: team/dlee/stasis-cache-split/tests/test_devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/tests/test_devicestate.c?view=diff&rev=395508&r1=395507&r2=395508
==============================================================================
--- team/dlee/stasis-cache-split/tests/test_devicestate.c (original)
+++ team/dlee/stasis-cache-split/tests/test_devicestate.c Fri Jul 26 11:23:35 2013
@@ -434,7 +434,7 @@
 	consumer = consumer_create();
 	ast_test_validate(test, NULL != consumer);
 
-	device_msg_router = stasis_message_router_create(stasis_caching_get_topic(ast_device_state_topic_cached()));
+	device_msg_router = stasis_message_router_create(ast_device_state_topic_cached());
 	ast_test_validate(test, NULL != device_msg_router);
 
 	ao2_ref(consumer, +1);