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 /build_tools | |
| 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 'build_tools')
| -rw-r--r-- | build_tools/cflags.xml | 2 | ||||
| -rwxr-xr-x | build_tools/make_buildopts_h | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index 1a2e78ff8..b91cf5af5 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -5,7 +5,7 @@ <member name="DEBUG_THREADS" displayname="Enable Thread Debugging"> <support_level>core</support_level> </member> - <member name="REF_DEBUG" displayname="Enable reference count debugging"> + <member name="REF_DEBUG" displayname="Enable reference count debugging by default"> <support_level>extended</support_level> </member> <member name="AO2_DEBUG" displayname="Enable internal Astobj2 debugging"> diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 55d08ba71..df506edbe 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -13,6 +13,20 @@ END TMP=`${GREP} -e "^MENUSELECT_CFLAGS" menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'` for x in ${TMP}; do echo "#define ${x} 1" + if test "${x}" = "DONT_OPTIMIZE" \ + -o "${x}" = "BETTER_BACKTRACES" \ + -o "${x}" = "LOTS_OF_SPANS" \ + -o "${x}" = "BUILD_NATIVE" \ + -o "${x}" = "REF_DEBUG" \ + -o "${x}" = "AO2_DEBUG" \ + -o "${x}" = "REBUILD_PARSERS" \ + -o "${x}" = "RADIO_RELAX" \ + -o "${x}" = "DEBUG_SCHEDULER" \ + -o "${x}" = "DETECT_DEADLOCKS" \ + -o "${x}" = "DUMP_SCHEDULER" ; then + # These aren't ABI affecting options, keep them out of AST_BUILDOPTS + continue + fi if test "x${BUILDOPTS}" != "x" ; then BUILDOPTS="${BUILDOPTS}, ${x}" else |