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_bridges.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_bridges.c')
| -rw-r--r-- | main/manager_bridges.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/manager_bridges.c b/main/manager_bridges.c index 7f0ae6b01..c791e63f3 100644 --- a/main/manager_bridges.c +++ b/main/manager_bridges.c @@ -350,7 +350,7 @@ static int manager_bridges_list(struct mansession *s, const struct message *m) ast_str_set(&id_text, 0, "ActionID: %s\r\n", id); } - bridges = stasis_cache_dump(ast_bridge_topic_all_cached(), ast_bridge_snapshot_type()); + bridges = stasis_cache_dump(ast_bridge_cache(), ast_bridge_snapshot_type()); if (!bridges) { astman_send_error(s, m, "Internal error"); return -1; @@ -382,7 +382,7 @@ static int send_bridge_info_item_cb(void *obj, void *arg, void *data, int flags) RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); struct ast_channel_snapshot *snapshot; RAII_VAR(struct ast_str *, channel_text, NULL, ast_free); - msg = stasis_cache_get(ast_channel_topic_all_cached(), + msg = stasis_cache_get(ast_channel_cache(), ast_channel_snapshot_type(), uniqueid); if (!msg) { @@ -432,7 +432,7 @@ static int manager_bridge_info(struct mansession *s, const struct message *m) ast_str_set(&id_text, 0, "ActionID: %s\r\n", id); } - msg = stasis_cache_get(ast_bridge_topic_all_cached(), ast_bridge_snapshot_type(), bridge_uniqueid); + msg = stasis_cache_get(ast_bridge_cache(), ast_bridge_snapshot_type(), bridge_uniqueid); if (!msg) { astman_send_error(s, m, "Specified BridgeUniqueid not found"); return -1; @@ -489,7 +489,7 @@ int manager_bridging_init(void) return -1; } - bridge_topic = stasis_caching_get_topic(ast_bridge_topic_all_cached()); + bridge_topic = ast_bridge_topic_all_cached(); if (!bridge_topic) { return -1; } |