[Openocd-svn] r1703 - in trunk: . src/helper

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-11 05:35:25 +0200 (Mon, 11 May 2009)
New Revision: 1703

Modified:
   trunk/configure.in
   trunk/src/helper/log.c
Log:
Add --enable-malloc-logging configure option and update log.c to match.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-05-11 02:52:00 UTC (rev 1702)
+++ trunk/configure.in	2009-05-11 03:35:25 UTC (rev 1703)
@@ -250,6 +250,19 @@
 fi
 
 
+debug_malloc=no
+AC_ARG_ENABLE(malloc_logging,
+	AS_HELP_STRING([--enable-malloc-logging],
+  		[Include free space in logging messages (requires malloc.h).]), 
+	[debug_malloc=$enableval], [])
+
+AC_MSG_CHECKING([whether to enable malloc free space logging]);
+AC_MSG_RESULT($debug_malloc)
+if test $debug_malloc = yes; then
+  AC_DEFINE([_DEBUG_FREE_SPACE_],[1], [Include malloc free space in logging])
+fi
+
+
 AC_ARG_ENABLE(parport,
   AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]), 
   [build_parport=$enableval], [build_parport=no])

Modified: trunk/src/helper/log.c
===================================================================
--- trunk/src/helper/log.c	2009-05-11 02:52:00 UTC (rev 1702)
+++ trunk/src/helper/log.c	2009-05-11 03:35:25 UTC (rev 1703)
@@ -41,10 +41,13 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-#define PRINT_MEM() 0
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#else
+#error "malloc.h is required to use --enable-malloc-logging"
 #endif
+#endif
 
 int debug_level = -1;
 
@@ -99,16 +102,16 @@
 		{
 			/* print with count and time information */
 			int t=(int)(timeval_ms()-start);
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
 			struct mallinfo info;
 			info = mallinfo();
 #endif
 			fprintf(log_output, "%s%d %d %s:%d %s()"
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
 					" %d"
 #endif
 					": %s", log_strings[level+1], count, t, file, line, function,
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
 					info.fordblks,
 #endif
 					string);