From 5c1d07baf083fd791c8f717209551d9227413ef7 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Fri, 17 Apr 2015 03:16:59 -0400 Subject: 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 --- include/asterisk/channel.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'include/asterisk/channel.h') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 82abe99c1..aec7f7529 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1186,8 +1186,6 @@ struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 16))) __ast_channel_alloc((needqueue), (state), (cid_num), (cid_name), (acctcode), (exten), (context), (assignedids), (requestor), (amaflag), (endpoint), \ __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) - -#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC) /*! * \brief Create a fake channel structure * @@ -1206,25 +1204,6 @@ struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 16))) */ #define ast_dummy_channel_alloc() __ast_dummy_channel_alloc(__FILE__, __LINE__, __PRETTY_FUNCTION__) struct ast_channel *__ast_dummy_channel_alloc(const char *file, int line, const char *function); -#else -/*! - * \brief Create a fake channel structure - * - * \retval NULL failure - * \retval non-NULL successfully allocated channel - * - * \note This function should ONLY be used to create a fake channel - * that can then be populated with data for use in variable - * substitution when a real channel does not exist. - * - * \note The created dummy channel should be destroyed by - * ast_channel_unref(). Using ast_channel_release() needlessly - * grabs the channel container lock and can cause a deadlock as - * a result. Also grabbing the channel container lock reduces - * system performance. - */ -struct ast_channel *ast_dummy_channel_alloc(void); -#endif /*! * \brief Queue one or more frames to a channel's frame queue -- cgit v1.2.3