List:Commits« Previous MessageNext Message »
From:marko.makela Date:May 19 2010 2:32pm
Subject:bzr commit into mysql-5.1-innodb branch (marko.makela:3474) Bug#53593
View as plain text  
#At file:///home/marko/innobase/dev/mysql/5.1-innodb/ based on revid:marko.makela@strippedqxuvcowbtk

 3474 Marko Mäkelä	2010-05-19
      Implement Valgrind memcheck instrumentation in the MySQL core. (Bug #53593)
      
      BUILD/*: Add valgrind_configs=--with-valgrind.
      BUILD/*: Remove -USAFEMALLOC from valgrind_flags.
      
      configure.in: Add AC_ARG_WITH(valgrind) and HAVE_VALGRIND.
      
      include/my_sys.h: Define a number of MEM_ wrappers for VALGRIND_ functions.
      include/my_sys.h: Make TRASH do MEM_UNDEFINED().
      
      include/m_string.h: Remove unused macro bzero_if_purify(A,B).
      
      _mymalloc(): Declare MEM_UNDEFINED() on the allocated memory.
      
      _myfree(): Declare MEM_NOACCESS() on the freed memory.
      
      storage/innobase/include/univ.i: Enable UNIV_DEBUG_VALGRIND based on
      HAVE_VALGRIND rather than HAVE_purify.
      
      Possible things to do:
       * In my_global.h, remove the defined(HAVE_purify) condition
         from the _WIN32 uint3korr() in my_global.h or use | instead of +
         in order not to confuse the Valgrind V bits
       * Consider replacing HAVE_purify with HAVE_VALGRIND
       * Use VALGRIND_CREATE_BLOCK, VALGRIND_DISCARD in mem_root and similar places

    modified:
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/compile-amd64-valgrind-max
      BUILD/compile-pentium-icc-valgrind-max
      BUILD/compile-pentium-valgrind-max
      BUILD/compile-pentium-valgrind-max-no-ndb
      BUILD/compile-pentium64-valgrind-max
      configure.in
      include/m_string.h
      include/my_sys.h
      mysys/safemalloc.c
      storage/innobase/include/univ.i
      storage/innodb_plugin/include/univ.i
=== modified file 'BUILD/SETUP.sh'
--- a/BUILD/SETUP.sh	revid:marko.makela@oracle.com-20100519081618-h38q02qxuvcowbtk
+++ b/BUILD/SETUP.sh	revid:marko.makela@strippede4b3
@@ -119,8 +119,12 @@ fi
 
 # Set flags for various build configurations.
 # Used in -valgrind builds
-valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify "
+# Override -DFORCE_INIT_OF_VARS from debug_cflags. It enables the macro
+# LINT_INIT(), which is only useful for silencing spurious warnings
+# of static analysis tools. We want LINT_INIT() to be a no-op in Valgrind.
+valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify "
 valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
+valgrind_configs="--with-valgrind"
 #
 # Used in -debug builds
 debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "

=== modified file 'BUILD/build_mccge.sh'
--- a/BUILD/build_mccge.sh	revid:marko.makela@oracle.com-20100519081618-h38q02qxuvcowbtk
+++ b/BUILD/build_mccge.sh	revid:marko.makela@stripped9-r1fhl95dy16ge4b3
@@ -938,9 +938,10 @@ set_up_ccache()
 set_valgrind_flags()
 {
   if test "x$valgrind_flag" = "xyes" ; then
-    loc_valgrind_flags="-USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify "
+    loc_valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify "
     loc_valgrind_flags="$loc_valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
     compiler_flags="$compiler_flags $loc_valgrind_flags"
+    with_flags="$with_flags --with-valgrind"
   fi
 }
 

=== modified file 'BUILD/compile-amd64-valgrind-max'
--- a/BUILD/compile-amd64-valgrind-max	revid:marko.makela@stripped
+++ b/BUILD/compile-amd64-valgrind-max	revid:marko.makela@stripped20100519143209-r1fhl95dy16ge4b3
@@ -4,7 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$amd64_cflags $debug_cflags $valgrind_flags"
-extra_configs="$amd64_configs $debug_configs $max_configs"
+extra_configs="$amd64_configs $debug_configs $valgrind_configs $max_configs"
 
 . "$path/FINISH.sh"
 

=== modified file 'BUILD/compile-pentium-icc-valgrind-max'
--- a/BUILD/compile-pentium-icc-valgrind-max	revid:marko.makela@stripped618-h38q02qxuvcowbtk
+++ b/BUILD/compile-pentium-icc-valgrind-max	revid:marko.makela@strippedhl95dy16ge4b3
@@ -29,6 +29,6 @@ extra_flags="$pentium_cflags $debug_cfla
 c_warnings="-Wall -Wcheck -wd161,444,279,810,981,1292,1469,1572"
 cxx_warnings="$c_warnings -wd869,874"
 base_cxxflags="-fno-exceptions -fno-rtti"
-extra_configs="$pentium_configs $debug_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs"
 
 . "$path/FINISH.sh"

=== modified file 'BUILD/compile-pentium-valgrind-max'
--- a/BUILD/compile-pentium-valgrind-max	revid:marko.makela@strippedowbtk
+++ b/BUILD/compile-pentium-valgrind-max	revid:marko.makela@stripped
@@ -4,7 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
-extra_configs="$pentium_configs $debug_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
 
 . "$path/FINISH.sh"
 

=== modified file 'BUILD/compile-pentium-valgrind-max-no-ndb'
--- a/BUILD/compile-pentium-valgrind-max-no-ndb	revid:marko.makela@stripped
+++ b/BUILD/compile-pentium-valgrind-max-no-ndb	revid:marko.makela@stripped
@@ -4,7 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
-extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_no_ndb_configs"
 
 . "$path/FINISH.sh"
 

=== modified file 'BUILD/compile-pentium64-valgrind-max'
--- a/BUILD/compile-pentium64-valgrind-max	revid:marko.makela@stripped
+++ b/BUILD/compile-pentium64-valgrind-max	revid:marko.makela@stripped
@@ -4,7 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium64_cflags $debug_cflags $valgrind_flags"
-extra_configs="$pentium_configs $debug_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
 
 . "$path/FINISH.sh"
 

=== modified file 'configure.in'
--- a/configure.in	revid:marko.makela@stripped
+++ b/configure.in	revid:marko.makela@strippedhl95dy16ge4b3
@@ -1729,6 +1729,17 @@ else
   CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
 fi
 
+AC_ARG_WITH([valgrind],
+  [AS_HELP_STRING([--with-valgrind],
+    [Valgrind instrumentation @<:@default=no@:>@])],
+    [], [with_valgrind=no])
+
+if test "$with_valgrind" != "no"
+then
+  AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
+    [AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
+fi
+
 # Debug Sync Facility. NOTE: depends on 'with_debug'. Must be behind it.
 AC_MSG_CHECKING(if Debug Sync Facility should be enabled.)
 AC_ARG_ENABLE(debug_sync,

=== modified file 'include/m_string.h'
--- a/include/m_string.h	revid:marko.makela@stripped81618-h38q02qxuvcowbtk
+++ b/include/m_string.h	revid:marko.makela@stripped
@@ -127,9 +127,6 @@ extern	size_t bcmp(const uchar *s1,const
 extern	size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
 #undef bcmp
 #define bcmp(A,B,C) my_bcmp((A),(B),(C))
-#define bzero_if_purify(A,B) bzero(A,B)
-#else
-#define bzero_if_purify(A,B)
 #endif /* HAVE_purify */
 
 #ifndef bmove512

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	revid:marko.makela@stripped0519081618-h38q02qxuvcowbtk
+++ b/include/my_sys.h	revid:marko.makela@stripped
@@ -25,6 +25,27 @@ typedef struct my_aio_result {
 } my_aio_result;
 #endif
 
+#ifdef HAVE_VALGRIND
+# include <valgrind/memcheck.h>
+# define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
+# define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
+# define MEM_DEFINED_ADDRESSABLE(a,len) VALGRIND_MAKE_MEM_DEFINED(a,len)
+# define MEM_DEFINED(a,len) VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(a,len)
+# define MEM_GET_VBITS(a,v,len) VALGRIND_GET_VBITS(a,v,len)
+# define MEM_SET_VBITS(a,v,len) VALGRIND_SET_VBITS(a,v,len)
+# define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
+# define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
+#else /* HAVE_VALGRIND */
+# define MEM_UNDEFINED(a,len) ((void) 0)
+# define MEM_NOACCESS(a,len) ((void) 0)
+# define MEM_DEFINED_ADDRESSABLE(a,len) ((void) 0)
+# define MEM_DEFINED(a,len) ((void) 0)
+# define MEM_GET_VBITS(a,v,len) ((void) 0)
+# define MEM_SET_VBITS(a,v,len) ((void) 0)
+# define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
+# define MEM_CHECK_DEFINED(a,len) ((void) 0)
+#endif /* HAVE_VALGRIND */
+
 #ifndef THREAD
 extern int NEAR my_errno;		/* Last error in mysys */
 #else
@@ -141,7 +162,7 @@ extern int NEAR my_errno;		/* Last error
 #define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
 #define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
 #define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)
-#define TRASH(A,B) bfill(A, B, 0x8F)
+#define TRASH(A,B) do { bfill(A, B, 0x8F); MEM_UNDEFINED(A, B); } while (0)
 #define QUICK_SAFEMALLOC sf_malloc_quick=1
 #define NORMAL_SAFEMALLOC sf_malloc_quick=0
 extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick;
@@ -169,7 +190,10 @@ extern char *my_strndup(const char *from
 #define CALLER_INFO_PROTO   /* nothing */
 #define CALLER_INFO         /* nothing */
 #define ORIG_CALLER_INFO    /* nothing */
-#define TRASH(A,B) /* nothing */
+#define TRASH(A,B) do {				\
+	MEM_CHECK_ADDRESSABLE(A, B);		\
+	MEM_UNDEFINED(A, B);			\
+} while (0)
 #endif
 
 #if defined(ENABLED_DEBUG_SYNC)

=== modified file 'mysys/safemalloc.c'
--- a/mysys/safemalloc.c	revid:marko.makela@oracle.com-20100519081618-h38q02qxuvcowbtk
+++ b/mysys/safemalloc.c	revid:marko.makela@strippedl95dy16ge4b3
@@ -190,9 +190,12 @@ void *_mymalloc(size_t size, const char
   sf_malloc_count++;
   pthread_mutex_unlock(&THR_LOCK_malloc);
 
+  MEM_CHECK_ADDRESSABLE(data, size);
   /* Set the memory to the aribtrary wierd value */
   if ((MyFlags & MY_ZEROFILL) || !sf_malloc_quick)
     bfill(data, size, (char) (MyFlags & MY_ZEROFILL ? 0 : ALLOC_VAL));
+  if (!(MyFlags & MY_ZEROFILL))
+    MEM_UNDEFINED(data, size);
   /* Return a pointer to the real data */
   DBUG_PRINT("exit",("ptr: %p", data));
   if (sf_min_adress > data)
@@ -309,7 +312,9 @@ void _myfree(void *ptr, const char *file
   if (!sf_malloc_quick)
     bfill(ptr, irem->datasize, (pchar) FREE_VAL);
 #endif
+  MEM_NOACCESS(ptr, irem->datasize);
   *((uint32*) ((char*) ptr- sizeof(uint32)))= ~MAGICKEY;
+  MEM_NOACCESS((char*) ptr - sizeof(uint32), sizeof(uint32));
   /* Actually free the memory */
   free((char*) irem);
   DBUG_VOID_RETURN;

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:marko.makela@oracle.com-20100519081618-h38q02qxuvcowbtk
+++ b/storage/innobase/include/univ.i	revid:marko.makela@stripped00519143209-r1fhl95dy16ge4b3
@@ -82,9 +82,9 @@ memory is read outside the allocated blo
 
 /* Make a non-inline debug version */
 
-#ifdef HAVE_purify
+#if defined HAVE_VALGRIND
 # define UNIV_DEBUG_VALGRIND
-#endif /* HAVE_purify */
+#endif /* HAVE_VALGRIND */
 #if 0
 #define UNIV_DEBUG_VALGRIND			/* Enable extra
 						Valgrind instrumentation */

=== modified file 'storage/innodb_plugin/include/univ.i'
--- a/storage/innodb_plugin/include/univ.i	revid:marko.makela@stripped
+++ b/storage/innodb_plugin/include/univ.i	revid:marko.makela@stripped
@@ -165,9 +165,9 @@ command. Not tested on Windows. */
 #define UNIV_COMPILE_TEST_FUNCS
 */
 
-#ifdef HAVE_purify
+#if defined HAVE_VALGRIND
 # define UNIV_DEBUG_VALGRIND
-#endif /* HAVE_purify */
+#endif /* HAVE_VALGRIND */
 #if 0
 #define UNIV_DEBUG_VALGRIND			/* Enable extra
 						Valgrind instrumentation */

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100519143209-r1fhl95dy16ge4b3.bundle
Thread
bzr commit into mysql-5.1-innodb branch (marko.makela:3474) Bug#53593marko.makela19 May
  • Re: bzr commit into mysql-5.1-innodb branch (marko.makela:3474)Bug#53593Davi Arnaut19 May
    • Re: bzr commit into mysql-5.1-innodb branch (marko.makela:3474)Bug#53593Marko Mäkelä20 May
    • Re: bzr commit into mysql-5.1-innodb branch (marko.makela:3474)Bug#53593Marko Mäkelä20 May