diff options
author | Matthew Jordan <mjordan@digium.com> | 2012-10-02 01:47:16 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2012-10-02 01:47:16 +0000 |
commit | a094707d5156a005fb6e9277bd4a14f9d7e7ab1c (patch) | |
tree | 26a15c7ef864995e2f2d89d09294024bad0145cb /main/event.c | |
parent | 4e228fce0382550136e5c34cb4d9fd400b8d4ad3 (diff) |
Fix a variety of ref counting issues
This patch resolves a number of ref leaks that occur primarily on Asterisk
shutdown. It adds a variety of shutdown routines to core portions of
Asterisk such that they can reclaim resources allocate duringd initialization.
Review: https://reviewboard.asterisk.org/r/2137
........
Merged revisions 374177 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374178 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374196 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/event.c')
-rw-r--r-- | main/event.c | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/main/event.c b/main/event.c index 12d3abb7f..4c231fe91 100644 --- a/main/event.c +++ b/main/event.c @@ -1811,6 +1811,38 @@ static struct ast_cli_entry event_cli[] = { AST_CLI_DEFINE(event_dump_cache, "Dump the internal event cache (for debugging)"), }; +/*! \internal \brief Clean up resources on Asterisk shutdown */ +static void event_shutdown(void) +{ + struct ast_event_sub *sub; + int i; + + if (event_dispatcher) { + event_dispatcher = ast_taskprocessor_unreference(event_dispatcher); + } + + /* Remove any remaining subscriptions. Note that we can't just call + * unsubscribe, as it will attempt to lock the subscription list + * as well */ + for (i = 0; i < AST_EVENT_TOTAL; i++) { + AST_RWDLLIST_WRLOCK(&ast_event_subs[i]); + while ((sub = AST_RWDLLIST_REMOVE_HEAD(&ast_event_subs[i], entry))) { + ast_event_sub_destroy(sub); + } + AST_RWDLLIST_UNLOCK(&ast_event_subs[i]); + AST_RWDLLIST_HEAD_DESTROY(&ast_event_subs[i]); + } + + for (i = 0; i < AST_EVENT_TOTAL; i++) { + if (!ast_event_cache[i].hash_fn) { + continue; + } + if (ast_event_cache[i].container) { + ao2_ref(ast_event_cache[i].container, -1); + } + } +} + int ast_event_init(void) { int i; @@ -1827,17 +1859,23 @@ int ast_event_init(void) if (!(ast_event_cache[i].container = ao2_container_alloc(NUM_CACHE_BUCKETS, ast_event_hash, ast_event_cmp))) { - return -1; + goto event_init_cleanup; } } if (!(event_dispatcher = ast_taskprocessor_get("core_event_dispatcher", 0))) { - return -1; + goto event_init_cleanup; } ast_cli_register_multiple(event_cli, ARRAY_LEN(event_cli)); + ast_register_atexit(event_shutdown); + return 0; + +event_init_cleanup: + event_shutdown(); + return -1; } size_t ast_event_minimum_length(void) |