diff options
author | David M. Lee <dlee@digium.com> | 2013-08-01 13:49:34 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-08-01 13:49:34 +0000 |
commit | e1b959ccbb4e47421b37a0f75a2bf89ccd34dcb1 (patch) | |
tree | 3026c96da713bafcf1126c77bde6994f348280bb /main/manager_endpoints.c | |
parent | 5c1396946929ab19e94c117f8ad3db5f78a450bc (diff) |
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
Diffstat (limited to 'main/manager_endpoints.c')
-rw-r--r-- | main/manager_endpoints.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/manager_endpoints.c b/main/manager_endpoints.c index f0ed28a2c..634283728 100644 --- a/main/manager_endpoints.c +++ b/main/manager_endpoints.c @@ -49,7 +49,11 @@ static void endpoint_state_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message) { - stasis_forward_message(ast_manager_get_topic(), stasis_caching_get_topic(ast_endpoint_topic_all_cached()), message); + /* XXX This looks wrong. Nothing should post or forward to a caching + * topic directly. Maybe ast_endpoint_topic() would be correct? I'd have + * to dig to make sure I don't break anything, though. + */ + stasis_forward_message(ast_manager_get_topic(), ast_endpoint_topic_all_cached(), message); } int manager_endpoints_init(void) @@ -64,7 +68,7 @@ int manager_endpoints_init(void) ast_register_atexit(manager_endpoints_shutdown); - endpoint_topic = stasis_caching_get_topic(ast_endpoint_topic_all_cached()); + endpoint_topic = ast_endpoint_topic_all_cached(); if (!endpoint_topic) { return -1; } |