MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:June 21 2010 11:39am
Subject:bzr commit into mysql-trunk-innodb branch (wlad:3109) Bug#53593
View as plain text  
#At file:///home/vvaintroub/bzr/mysql-trunk-innodb/ based on revid:marko.makela@stripped

 3109 Vladislav Vaintroub	2010-06-21
      Bug#53593: Add some instrumentation to improve Valgrind sensitivity.
      Implement WITH_VALGRIND for the CMake build.

    modified:
      CMakeLists.txt
      config.h.cmake
      configure.cmake
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-05-18 12:52:51 +0000
+++ b/CMakeLists.txt	2010-06-21 11:39:30 +0000
@@ -115,6 +115,9 @@ OPTION(ENABLED_PROFILING "Enable profili
 OPTION(CYBOZU "" OFF)
 OPTION(BACKUP_TEST "" OFF)
 OPTION(WITHOUT_SERVER OFF)
+IF(UNIX)
+  OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
+ENDIF()
 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 

=== modified file 'config.h.cmake'
--- a/config.h.cmake	2010-05-21 13:17:01 +0000
+++ b/config.h.cmake	2010-06-21 11:39:30 +0000
@@ -292,7 +292,7 @@
 #define USE_MB 1
 #define USE_MB_IDENT 1
 
-
+#cmakedefine HAVE_VALGRIND
 
 /* Types we may use */
 #cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@

=== modified file 'configure.cmake'
--- a/configure.cmake	2010-05-27 07:42:48 +0000
+++ b/configure.cmake	2010-06-21 11:39:30 +0000
@@ -777,7 +777,7 @@ ENDIF(NOT HAVE_POSIX_SIGNALS)
 # Assume regular sprintf
 SET(SPRINTFS_RETURNS_INT 1)
 
-IF(CMAKE_COMPILER_IS_GNUXX)
+IF(CMAKE_COMPILER_IS_GNUCXX)
 CHECK_CXX_SOURCE_COMPILES("
  #include <cxxabi.h>
  int main(int argc, char **argv) 
@@ -969,6 +969,14 @@ configuration. By default gcc built-in s
 if available and 'smp' configuration otherwise.")
 MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY)
 
+IF(WITH_VALGRIND)
+  CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 
+    HAVE_VALGRIND_HEADERS)
+  IF(HAVE_VALGRIND_HEADERS)
+    SET(HAVE_VALGRIND 1)
+  ENDIF()
+ENDIF()
+
 #--------------------------------------------------------------------
 # Check for IPv6 support
 #--------------------------------------------------------------------


Attachment: [text/bzr-bundle] bzr/wlad@sun.com-20100621113930-szqo6v1vxba1hyym.bundle
Thread
bzr commit into mysql-trunk-innodb branch (wlad:3109) Bug#53593Vladislav Vaintroub21 Jun