[svn-commits] seanbright: trunk r135405 - in /trunk: ./ build_tools/ doc/ include/asterisk/...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sun Aug  3 11:14:14 2008
New Revision: 135405

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135405
Log:
Merge in changes that allow Asterisk to be built against the Hoard
memory allocator.  See doc/hoard.txt for more details.

Added:
    trunk/doc/hoard.txt
      - copied unchanged from r135404, team/seanbright/hoard-integration/doc/hoard.txt
Modified:
    trunk/CHANGES
    trunk/build_tools/cflags.xml
    trunk/build_tools/menuselect-deps.in
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in
    trunk/main/Makefile
    trunk/makeopts.in

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Sun Aug  3 11:14:14 2008
@@ -197,6 +197,8 @@
     the 'setvar' option to cause a given audio file to be played upon completion
     of an attended transfer.  Currently it works for DAHDI, IAX2, SIP, and
     Skinny channels only.
+  * You can now compile Asterisk against the Hoard Memory Allocator, see doc/hoard.txt
+    for more information.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0  -------------

Modified: trunk/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/cflags.xml?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/build_tools/cflags.xml (original)
+++ trunk/build_tools/cflags.xml Sun Aug  3 11:14:14 2008
@@ -9,6 +9,10 @@
 			<defaultenabled>yes</defaultenabled>
 		</member>
 		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
+		</member>
+		<member name="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one">
+			<defaultenabled>no</defaultenabled>
+			<depend>hoard</depend>
 		</member>
 		<member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
 		</member>

Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Sun Aug  3 11:14:14 2008
@@ -9,6 +9,7 @@
 GTK2=@PBX_GTK2@
 GTK=@PBX_GTK@
 H323=@PBX_H323@
+HOARD=@PBX_HOARD@
 ICONV=@PBX_ICONV@
 IKSEMEL=@PBX_IKSEMEL@
 IMAP_TK=@PBX_IMAP_TK@

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Aug  3 11:14:14 2008
@@ -215,6 +215,7 @@
 AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
 AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
 AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
+AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard])
 AST_EXT_LIB_SETUP([ICONV], [Iconv Library], [iconv])
 AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
 AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
@@ -1426,6 +1427,8 @@
 
 AST_EXT_TOOL_CHECK([GMIME], [gmime])
 
+AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
+
 AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h])
 
 AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Sun Aug  3 11:14:14 2008
@@ -342,6 +342,12 @@
 
 /* Define if your system has the GTK2 libraries. */
 #undef HAVE_GTK2
+
+/* Define this to indicate the ${HOARD_DESCRIP} library */
+#undef HAVE_HOARD
+
+/* Define to indicate the ${HOARD_DESCRIP} library version */
+#undef HAVE_HOARD_VERSION
 
 /* Define this to indicate the ${ICONV_DESCRIP} library */
 #undef HAVE_ICONV

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Sun Aug  3 11:14:14 2008
@@ -104,6 +104,12 @@
   ASTLINK=
 endif
 
+ifneq ($(findstring USE_HOARD_ALLOCATOR,$(MENUSELECT_CFLAGS)),)
+  ifneq ($(HOARD_LIB),)
+    AST_LIBS+=$(HOARD_LIB)
+  endif
+endif
+
 CHECK_SUBDIR:	# do nothing, just make sure that we recurse in the subdir/
 
 editline/libedit.a: CHECK_SUBDIR

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=135405&r1=135404&r2=135405
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Sun Aug  3 11:14:14 2008
@@ -84,6 +84,8 @@
 GMIME_INCLUDE=@GMIME_INCLUDE@
 GMIME_LIB=@GMIME_LIB@
 
+HOARD_LIB=@HOARD_LIB@
+
 GSM_INTERNAL=@GSM_INTERNAL@
 GSM_INCLUDE=@GSM_INCLUDE@
 GSM_LIB=@GSM_LIB@