[svn-commits] branch russell/make_menuconfig - r7536 in /team/russell/make_menuconfig: ./ b...

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Dec 20 01:02:28 2005
New Revision: 7536

URL: http://svn.digium.com/view/asterisk?rev=7536&view=rev
Log:
add support for setting malloc debug

Modified:
    team/russell/make_menuconfig/Makefile
    team/russell/make_menuconfig/build_tools/makeopts.xml
    team/russell/make_menuconfig/build_tools/menuconfig.c

Modified: team/russell/make_menuconfig/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/Makefile?rev=7536&r1=7535&r2=7536&view=diff
==============================================================================
--- team/russell/make_menuconfig/Makefile (original)
+++ team/russell/make_menuconfig/Makefile Tue Dec 20 01:02:28 2005
@@ -173,7 +173,11 @@
 # Include the local build configuration
 ifneq ($(wildcard asterisk.makeopts),)
   include asterisk.makeopts
-  ASTCFLAGS+= $(BUILD_CONFIG_CFLAGS)
+  ASTCFLAGS+= $(MAKEOPTS_CFLAGS)
+endif
+
+ifeq ($(findstring MALLOC_DEBUG,$(MAKEOPTS_CFLAGS)),MALLOC_DEBUG)
+  ASTCFLAGS+= -include $(PWD)/include/asterisk/astmm.h
 endif
 
 ifeq ($(OSARCH),Linux)

Modified: team/russell/make_menuconfig/build_tools/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/makeopts.xml?rev=7536&r1=7535&r2=7536&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/makeopts.xml (original)
+++ team/russell/make_menuconfig/build_tools/makeopts.xml Tue Dec 20 01:02:28 2005
@@ -339,39 +339,52 @@
 </category>
 
 <category>
-	<name>BUILD_CONFIG_CFLAGS</name>
-	<displayname>Compiler Options</displayname>
+	<name>MAKEOPTS_CFLAGS</name>
+	<displayname>Build Options</displayname>
 	<member>
 		<name>-DDEBUG_SCHEDULER</name>
+		<displayname>DEBUG_SCHEDULER</displayname>
 		<description>debug the scheduler</description>
 	</member>
 	<member>
 		<name>-DDEBUG_THREADS</name>
+		<displayname>DEBUG_THREADS</displayname>
 		<description>thread debugging</description>
 	</member>
 	<member>
 		<name>-DDETECT_DEADLOCKS</name>
+		<displayname>DETECT_DEADLOCKS</displayname>
 		<description>detect deadlocks</description>
 	</member>
 	<member>
 		<name>-DDUMP_SCHEDULER</name>
+		<displayname>DUMP_SCHEDULER</displayname>
 		<description>Dump the contents of the scheduler</description>
 	</member>
 	<member>
 		<name>-DLOW_MEMORY</name>
+		<displayname>LOW_MEMORY</displayname>
 		<description>If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY to reduce the size of certain static buffers</description>
 	</member>
 	<member>
+		<name>-DMALLOC_DEBUG</name>
+		<displayname>MALLOC_DEBUG</displayname>
+		<description>track memory allocation</description>
+	</member>
+	<member>
 		<name>-DOLD_DSP_ROUTINES</name>
+		<displayname>OLD_DSP_ROUTINES</displayname>
 		<description>Use the older DSP routines</description>
 	</member>
 	<member>
 		<name>-DRADIO_RELAX</name>
+		<displayname>RADIO_RELOAX</displayname>
 		<description>If you are running a radio application, define RADIO_RELAX so that the DTMF will be received more reliably</description>
 
 	</member>
 	<member>
 		<name>-DTRACE_FRAMES</name>
+		<displayname>TRACE_FRAMES</displayname>
 		<description>trace frames</description>
 	</member>
 </category>

Modified: team/russell/make_menuconfig/build_tools/menuconfig.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/menuconfig.c?rev=7536&r1=7535&r2=7536&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/menuconfig.c (original)
+++ team/russell/make_menuconfig/build_tools/menuconfig.c Tue Dec 20 01:02:28 2005
@@ -583,7 +583,6 @@
 		case KEY_ENTER:
 		case '\n':
 		case ' ':
-		case '^':
 			toggle_enabled(cat, curopt);
 			draw_category_menu(menu, cat, start, end, curopt);
 			break;
@@ -662,6 +661,7 @@
 		case KEY_RIGHT:
 		case KEY_ENTER:
 		case '\n':
+		case ' ':
 			c = run_category_menu(menu, curopt);
 			draw_main_menu(menu, curopt);
 			break;