diff options
| author | Corey Farrell <git@cfware.com> | 2015-04-17 03:16:59 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-04-27 18:37:26 -0400 |
| commit | 5c1d07baf083fd791c8f717209551d9227413ef7 (patch) | |
| tree | 7eff8c651efb82e89fd7918038102b84fe888ced /main/channel_internal_api.c | |
| parent | d7f4788341f08f386341416aa3944c7f9bc0dc1b (diff) | |
Astobj2: Allow reference debugging to be enabled/disabled by config.
* The REF_DEBUG compiler flag no longer has any effect on code that uses
Astobj2. It is used to determine if reference debugging is enabled by
default. Reference debugging can be enabled or disabled in asterisk.conf.
* Caller information is provided in logger errors for ao2 bad magic numbers.
* Optimizes AO2 by merging internal functions with the public counterpart.
This was possible now that we no longer require a dual ABI.
ASTERISK-24974 #close
Reported by: Corey Farrell
Change-Id: Icf3552721fe999365ba8a8cf00a965aa6b897cc1
Diffstat (limited to 'main/channel_internal_api.c')
| -rw-r--r-- | main/channel_internal_api.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c index 4e8539889..0bb38499b 100644 --- a/main/channel_internal_api.c +++ b/main/channel_internal_api.c @@ -1439,15 +1439,9 @@ static int pvt_cause_cmp_fn(void *obj, void *vstr, int flags) struct ast_channel *__ast_channel_internal_alloc(void (*destructor)(void *obj), const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *file, int line, const char *function) { struct ast_channel *tmp; -#if defined(REF_DEBUG) - tmp = __ao2_alloc_debug(sizeof(*tmp), destructor, - AO2_ALLOC_OPT_LOCK_MUTEX, "", file, line, function, 1); -#elif defined(__AST_DEBUG_MALLOC) - tmp = __ao2_alloc_debug(sizeof(*tmp), destructor, - AO2_ALLOC_OPT_LOCK_MUTEX, "", file, line, function, 0); -#else - tmp = ao2_alloc(sizeof(*tmp), destructor); -#endif + + tmp = __ao2_alloc(sizeof(*tmp), destructor, + AO2_ALLOC_OPT_LOCK_MUTEX, "", file, line, function); if (!tmp) { return NULL; |