kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Destroy the generic_monitors container after the core_instances in ccss

Browse Source 
For each item in core_instances disposed of in the shutdown of ccss, any
generic monitor instances referenced by the objects will be removed from
generic_monitors during their destruction.  Hilarity ensues if
generic_monitors no longer exists.

Thanks to the Asterisk Test Suite's generic_ccss test for complaining loudly
when it ran into this.
........

Merged revisions 374300 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 374301 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-10-03 17:27:53 +00:00
parent 9b25076e83
commit 9367893cff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/ccss.c
View File

@@ -4535,14 +4535,15 @@ static void cc_shutdown(void)
if (cc_core_taskprocessor) {
cc_core_taskprocessor = ast_taskprocessor_unreference(cc_core_taskprocessor);
}
if (generic_monitors) {
ao2_t_ref(generic_monitors, -1, "Unref generic_monitor container in cc_shutdown");
generic_monitors = NULL;
}
/* Note that core instances must be destroyed prior to the generic_monitors */
if (cc_core_instances) {
ao2_t_ref(cc_core_instances, -1, "Unref cc_core_instances container in cc_shutdown");
cc_core_instances = NULL;
}
if (generic_monitors) {
ao2_t_ref(generic_monitors, -1, "Unref generic_monitor container in cc_shutdown");
generic_monitors = NULL;
}
}
int ast_cc_init(void)