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 /include/asterisk | |
| 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 'include/asterisk')
| -rw-r--r-- | include/asterisk/astobj2.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index 3b93a029e..c682baa39 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -1757,6 +1757,12 @@ void ao2_bt(void); /* backtrace */ * \note they must be able to handle NULL parameters because most of the * allocation/find functions can fail and we don't want to try to tear * down a NULL */ -void ao2_cleanup(void *obj); +void __ao2_cleanup(void *obj); +void __ao2_cleanup_debug(void *obj, const char *file, int line, const char *function); +#ifdef REF_DEBUG +#define ao2_cleanup(obj) __ao2_cleanup_debug((obj), __FILE__, __LINE__, __PRETTY_FUNCTION__) +#else +#define ao2_cleanup(obj) __ao2_cleanup(obj) +#endif void ao2_iterator_cleanup(struct ao2_iterator *iter); #endif /* _ASTERISK_ASTOBJ2_H */ |