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/channel.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/channel.c')
| -rw-r--r-- | main/channel.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 751cbdd52..b0761e185 100644 --- a/main/channel.c +++ b/main/channel.c @@ -8553,6 +8553,15 @@ static const struct ast_data_entry channel_providers[] = { AST_DATA_ENTRY("/asterisk/core/channeltypes", &channeltypes_provider), }; +static void channels_shutdown(void) +{ + ast_data_unregister(NULL); + if (channels) { + ao2_container_unregister("channels"); + ao2_ref(channels, -1); + } +} + void ast_channels_init(void) { channels = ao2_container_alloc(NUM_CHANNEL_BUCKETS, @@ -8566,6 +8575,8 @@ void ast_channels_init(void) ast_data_register_multiple_core(channel_providers, ARRAY_LEN(channel_providers)); ast_plc_reload(); + + ast_register_atexit(channels_shutdown); } /*! \brief Print call group and pickup group ---*/ |