From e1b959ccbb4e47421b37a0f75a2bf89ccd34dcb1 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Thu, 1 Aug 2013 13:49:34 +0000 Subject: Split caching out from the stasis_caching_topic. In working with res_stasis, I discovered a significant limitation to the current structure of stasis_caching_topics: you cannot subscribe to cache updates for a single channel/bridge/endpoint/etc. To address this, this patch splits the cache away from the stasis_caching_topic, making it a first class object. The stasis_cache object is shared amongst individual stasis_caching_topics that are created per channel/endpoint/etc. These are still forwarded to global whatever_all_cached topics, so their use from most of the code does not change. In making these changes, I noticed that we frequently used a similar pattern for bridges, endpoints and channels: single_topic ----------------> all_topic ^ | single_topic_cached ----+----> all_topic_cached | +----> cache This pattern was extracted as the 'Stasis Caching Pattern', defined in stasis_caching_pattern.h. This avoids a lot of duplicate code between the different domain objects. Since the cache is now disassociated from its upstream caching topics, this also necessitated a change to how the 'guaranteed' flag worked for retrieving from a cache. The code for handling the caching guarantee was extracted into a 'stasis_topic_wait' function, which works for any stasis_topic. (closes issue ASTERISK-22002) Review: https://reviewboard.asterisk.org/r/2672/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395954 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/cel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/cel.c') diff --git a/main/cel.c b/main/cel.c index f66fbdcc0..a03d08115 100644 --- a/main/cel.c +++ b/main/cel.c @@ -1551,14 +1551,14 @@ int ast_cel_engine_init(void) } cel_channel_forwarder = stasis_forward_all( - stasis_caching_get_topic(ast_channel_topic_all_cached()), + ast_channel_topic_all_cached(), cel_aggregation_topic); if (!cel_channel_forwarder) { return -1; } cel_bridge_forwarder = stasis_forward_all( - stasis_caching_get_topic(ast_bridge_topic_all_cached()), + ast_bridge_topic_all_cached(), cel_aggregation_topic); if (!cel_bridge_forwarder) { return -1; -- cgit v1.2.3