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

stasis_cache.c: Remove some unnecessary RAII_VAR() usage.

Browse Source 
........

Merged revisions 409272 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@409273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-03-01 00:02:02 +00:00
parent f9c031ec39
commit 77625956dd
1 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
main/stasis_cache.c
View File

@@ -57,7 +57,8 @@ struct stasis_caching_topic {
struct stasis_subscription *sub; struct stasis_subscription *sub;
}; };
static void stasis_caching_topic_dtor(void *obj) { static void stasis_caching_topic_dtor(void *obj)
{
struct stasis_caching_topic *caching_topic = obj; struct stasis_caching_topic *caching_topic = obj;
/* Caching topics contain subscriptions, and must be manually /* Caching topics contain subscriptions, and must be manually
@@ -84,26 +85,28 @@ struct stasis_topic *stasis_caching_get_topic(struct stasis_caching_topic *cachi
struct stasis_caching_topic *stasis_caching_unsubscribe(struct stasis_caching_topic *caching_topic) struct stasis_caching_topic *stasis_caching_unsubscribe(struct stasis_caching_topic *caching_topic)
{ {
if (caching_topic) { if (!caching_topic) {
RAII_VAR(struct stasis_caching_topic *, hold_ref, NULL, return NULL;
ao2_cleanup);
/* The subscription may hold the last reference to this caching
* topic, but we want to make sure the unsubscribe finishes
* before kicking of the caching topic's dtor.
*/
ao2_ref(caching_topic, +1);
hold_ref = caching_topic;
if (stasis_subscription_is_subscribed(caching_topic->sub)) {
/* Increment the reference to hold on to it past the
* unsubscribe. Will be cleaned up in dtor. */
ao2_ref(caching_topic->sub, +1);
stasis_unsubscribe(caching_topic->sub);
} else {
ast_log(LOG_ERROR, "stasis_caching_topic unsubscribed multiple times\n");
}
} }
/*
* The subscription may hold the last reference to this caching
* topic, but we want to make sure the unsubscribe finishes
* before kicking of the caching topic's dtor.
*/
ao2_ref(caching_topic, +1);
if (stasis_subscription_is_subscribed(caching_topic->sub)) {
/*
* Increment the reference to hold on to it past the
* unsubscribe. Will be cleaned up in dtor.
*/
ao2_ref(caching_topic->sub, +1);
stasis_unsubscribe(caching_topic->sub);
} else {
ast_log(LOG_ERROR, "stasis_caching_topic unsubscribed multiple times\n");
}
ao2_cleanup(caching_topic);
return NULL; return NULL;
} }
@@ -325,20 +328,13 @@ STASIS_MESSAGE_TYPE_DEFN(stasis_cache_update_type);
struct stasis_message *stasis_cache_clear_create(struct stasis_message *id_message) struct stasis_message *stasis_cache_clear_create(struct stasis_message *id_message)
{ {
RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); return stasis_message_create(stasis_cache_clear_type(), id_message);
msg = stasis_message_create(stasis_cache_clear_type(), id_message);
if (!msg) {
return NULL;
}
ao2_ref(msg, +1);
return msg;
} }
static void stasis_cache_update_dtor(void *obj) static void stasis_cache_update_dtor(void *obj)
{ {
struct stasis_cache_update *update = obj; struct stasis_cache_update *update = obj;
ao2_cleanup(update->old_snapshot); ao2_cleanup(update->old_snapshot);
update->old_snapshot = NULL; update->old_snapshot = NULL;
ao2_cleanup(update->new_snapshot); ao2_cleanup(update->new_snapshot);
@@ -349,8 +345,8 @@ static void stasis_cache_update_dtor(void *obj)
static struct stasis_message *update_create(struct stasis_message *old_snapshot, struct stasis_message *new_snapshot) static struct stasis_message *update_create(struct stasis_message *old_snapshot, struct stasis_message *new_snapshot)
{ {
RAII_VAR(struct stasis_cache_update *, update, NULL, ao2_cleanup); struct stasis_cache_update *update;
RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); struct stasis_message *msg;
ast_assert(old_snapshot != NULL || new_snapshot != NULL); ast_assert(old_snapshot != NULL || new_snapshot != NULL);
@@ -376,11 +372,8 @@ static struct stasis_message *update_create(struct stasis_message *old_snapshot,
} }
msg = stasis_message_create(stasis_cache_update_type(), update); msg = stasis_message_create(stasis_cache_update_type(), update);
if (!msg) {
return NULL;
}
ao2_ref(msg, +1); ao2_cleanup(update);
return msg; return msg;
} }