[svn-commits] dlee: branch dlee/stasis-cache-split r394174 - /team/dlee/stasis-cache-split/...

[SVN commits to the Digium repositories]

Author: dlee
Date: Thu Jul 11 16:48:10 2013
New Revision: 394174

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394174
Log:
compiles

Modified:
    team/dlee/stasis-cache-split/main/stasis_cache.c
    team/dlee/stasis-cache-split/main/stasis_channels.c

Modified: team/dlee/stasis-cache-split/main/stasis_cache.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/main/stasis_cache.c?view=diff&rev=394174&r1=394173&r2=394174
==============================================================================
--- team/dlee/stasis-cache-split/main/stasis_cache.c (original)
+++ team/dlee/stasis-cache-split/main/stasis_cache.c Thu Jul 11 16:48:10 2013
@@ -395,7 +395,7 @@
 		ast_assert(clear_type != NULL);
 
 		if (clear_id) {
-			old_snapshot = cache_put(cache, clear_type, clear_id, NULL);
+			old_snapshot = cache_put(caching_topic->cache, clear_type, clear_id, NULL);
 			if (old_snapshot) {
 				update = update_create(topic, old_snapshot, NULL);
 				stasis_publish(caching_topic->topic, update);
@@ -418,7 +418,7 @@
 		RAII_VAR(struct stasis_message *, old_snapshot, NULL, ao2_cleanup);
 		RAII_VAR(struct stasis_message *, update, NULL, ao2_cleanup);
 
-		old_snapshot = cache_put(cache, stasis_message_type(message), id, message);
+		old_snapshot = cache_put(caching_topic->cache, stasis_message_type(message), id, message);
 
 		update = update_create(topic, old_snapshot, message);
 		if (update == NULL) {

Modified: team/dlee/stasis-cache-split/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/main/stasis_channels.c?view=diff&rev=394174&r1=394173&r2=394174
==============================================================================
--- team/dlee/stasis-cache-split/main/stasis_channels.c (original)
+++ team/dlee/stasis-cache-split/main/stasis_channels.c Thu Jul 11 16:48:10 2013
@@ -875,14 +875,14 @@
 		return -1;
 	}
 
-	channel_cache_by_name = stasis_cache_create_secondary(
-		channel_snapshot_get_name);
+	channel_cache_by_name = stasis_cache_create(channel_snapshot_get_name);
 	if (!channel_cache_by_name) {
 		return -1;
 	}
 
 	channel_by_name_topic = stasis_caching_topic_create(
-		"ast_channel_topic_by_name", channel_cache_by_name);
+		stasis_cache_all_topic(channel_cache_all),
+		channel_cache_by_name);
 	if (!channel_by_name_topic) {
 		return -1;
 	}