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

Refactored the rest of the message types to use the STASIS_MESSAGE_TYPE_*

Browse Source 
macros.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-05-15 02:37:22 +00:00
parent e8f4ac6c61
commit 9648e258c7
11 changed files with 53 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/app.c
View File

@@ -84,9 +84,10 @@ static AST_LIST_HEAD_STATIC(zombies, zombie);
static struct stasis_topic *mwi_topic_all;
static struct stasis_caching_topic *mwi_topic_cached;
static struct stasis_message_type *mwi_state_type;
static struct stasis_topic_pool *mwi_topic_pool;
STASIS_MESSAGE_TYPE_DEFN(stasis_mwi_state_type);
static void *shaun_of_the_dead(void *data)
{
struct zombie *cur;
@@ -2659,11 +2660,6 @@ struct stasis_caching_topic *stasis_mwi_topic_cached(void)
return mwi_topic_cached;
}
struct stasis_message_type *stasis_mwi_state_type(void)
{
return mwi_state_type;
}
struct stasis_topic *stasis_mwi_topic(const char *uniqueid)
{
return stasis_topic_pool_get_topic(mwi_topic_pool, uniqueid);
@@ -2732,8 +2728,7 @@ static void app_exit(void)
ao2_cleanup(mwi_topic_all);
mwi_topic_all = NULL;
mwi_topic_cached = stasis_caching_unsubscribe(mwi_topic_cached);
ao2_cleanup(mwi_state_type);
mwi_state_type = NULL;
STASIS_MESSAGE_TYPE_CLEANUP(stasis_mwi_state_type);
ao2_cleanup(mwi_topic_pool);
mwi_topic_pool = NULL;
}
@@ -2748,8 +2743,7 @@ int app_init(void)
if (!mwi_topic_cached) {
return -1;
}
mwi_state_type = stasis_message_type_create("stasis_mwi_state");
if (!mwi_state_type) {
if (STASIS_MESSAGE_TYPE_INIT(stasis_mwi_state_type) != 0) {
return -1;
}
mwi_topic_pool = stasis_topic_pool_create(mwi_topic_all);