kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "endpoint/stasis: Eliminate duplicate events on endpoint status change""

Browse Source
This commit is contained in:
Joshua Colp
2015-05-29 14:55:22 -05:00
committed by Gerrit Code Review
parent 9159abb158 82716410a4
commit 3fc4a58d75
3 changed files with 21 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/asterisk/stasis_cache_pattern.h
View File

@@ -109,8 +109,6 @@ struct stasis_cp_single;
/*!
* \brief Create the 'one' side of the cache pattern.
*
* Create the 'one' and forward to all's topic and topic_cached.
*
* Dispose of using stasis_cp_single_unsubscribe().
*
* \param all Corresponding all side.
@@ -120,32 +118,6 @@ struct stasis_cp_single;
struct stasis_cp_single *stasis_cp_single_create(struct stasis_cp_all *all,
const char *name);
/*!
* \brief Create the 'one' side of the cache pattern.
*
* Create the 'one' but do not automatically forward.
*
* Dispose of using stasis_cp_single_unsubscribe().
*
* \param all Corresponding all side.
* \param name Base name for the topics.
* \return One side instance
*/
struct stasis_cp_single *stasis_cp_single_create_only(struct stasis_cp_all *all,
const char *name);
/*!
* \brief Set up a topic and topic cache forward.
*
* Forward 'from' to 'to'.
*
* \param from Source 'one' side instance.
* \param to Destination 'one' side instance.
* \retval 0 Success
* \retval -1 Failure
*/
int stasis_cp_single_forward(struct stasis_cp_single *from, struct stasis_cp_single *to);
/*!
* \brief Stops caching and forwarding messages.
*

28
main/endpoints.c
View File

@@ -74,6 +74,8 @@ struct ast_endpoint {
struct stasis_message_router *router;
/*! ast_str_container of channels associated with this endpoint */
struct ao2_container *channel_ids;
/*! Forwarding subscription from an endpoint to its tech endpoint */
struct stasis_forward *tech_forward;
};
static int endpoint_hash(const void *obj, int flags)
@@ -301,14 +303,13 @@ static struct ast_endpoint *endpoint_internal_create(const char *tech, const cha
return NULL;
}
endpoint->topics = stasis_cp_single_create(ast_endpoint_cache_all(),
endpoint->id);
if (!endpoint->topics) {
return NULL;
}
if (!ast_strlen_zero(resource)) {
endpoint->topics = stasis_cp_single_create_only(ast_endpoint_cache_all(),
endpoint->id);
if (!endpoint->topics) {
return NULL;
}
endpoint->router = stasis_message_router_create_pool(ast_endpoint_topic(endpoint));
if (!endpoint->router) {
return NULL;
@@ -322,19 +323,11 @@ static struct ast_endpoint *endpoint_internal_create(const char *tech, const cha
return NULL;
}
if (stasis_cp_single_forward(endpoint->topics, tech_endpoint->topics)) {
return NULL;
}
endpoint->tech_forward = stasis_forward_all(stasis_cp_single_topic(endpoint->topics),
stasis_cp_single_topic(tech_endpoint->topics));
endpoint_publish_snapshot(endpoint);
ao2_link(endpoints, endpoint);
} else {
endpoint->topics = stasis_cp_single_create(ast_endpoint_cache_all(),
endpoint->id);
if (!endpoint->topics) {
return NULL;
}
ao2_link(tech_endpoints, endpoint);
}
@@ -382,6 +375,7 @@ void ast_endpoint_shutdown(struct ast_endpoint *endpoint)
}
ao2_unlink(endpoints, endpoint);
endpoint->tech_forward = stasis_forward_cancel(endpoint->tech_forward);
clear_msg = create_endpoint_snapshot_message(endpoint);
if (clear_msg) {

51
main/stasis_cache_pattern.c
View File

@@ -138,11 +138,20 @@ struct stasis_cp_single *stasis_cp_single_create(struct stasis_cp_all *all,
{
RAII_VAR(struct stasis_cp_single *, one, NULL, ao2_cleanup);
one = stasis_cp_single_create_only(all, name);
one = ao2_t_alloc(sizeof(*one), one_dtor, name);
if (!one) {
return NULL;
}
one->topic = stasis_topic_create(name);
if (!one->topic) {
return NULL;
}
one->topic_cached = stasis_caching_topic_create(one->topic, all->cache);
if (!one->topic_cached) {
return NULL;
}
one->forward_topic_to_all = stasis_forward_all(one->topic, all->topic);
if (!one->forward_topic_to_all) {
return NULL;
@@ -157,46 +166,6 @@ struct stasis_cp_single *stasis_cp_single_create(struct stasis_cp_all *all,
return one;
}
struct stasis_cp_single *stasis_cp_single_create_only(struct stasis_cp_all *all,
const char *name)
{
RAII_VAR(struct stasis_cp_single *, one, NULL, ao2_cleanup);
one = ao2_t_alloc(sizeof(*one), one_dtor, name);
if (!one) {
return NULL;
}
one->topic = stasis_topic_create(name);
if (!one->topic) {
return NULL;
}
one->topic_cached = stasis_caching_topic_create(one->topic, all->cache);
if (!one->topic_cached) {
return NULL;
}
ao2_ref(one, +1);
return one;
}
int stasis_cp_single_forward(struct stasis_cp_single *from, struct stasis_cp_single *to)
{
from->forward_topic_to_all = stasis_forward_all(from->topic, to->topic);
if (!from->forward_topic_to_all) {
return -1;;
}
from->forward_cached_to_all = stasis_forward_all(
stasis_caching_get_topic(from->topic_cached),
stasis_caching_get_topic(to->topic_cached));
if (!from->forward_cached_to_all) {
return -1;
}
return 0;
}
void stasis_cp_single_unsubscribe(struct stasis_cp_single *one)
{
if (!one) {