[mpich2-commits] r5508 - mpich2/trunk/src/include

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-10-20 15:35:44 -0500 (Tue, 20 Oct 2009)
New Revision: 5508

Modified:
   mpich2/trunk/src/include/mpiu_valgrind.h
Log:
Add more valgrind client request macros.

These mostly have to do with valgrind's mempool feature.

No reviewer.

Modified: mpich2/trunk/src/include/mpiu_valgrind.h
===================================================================
--- mpich2/trunk/src/include/mpiu_valgrind.h	2009-10-20 20:35:42 UTC (rev 5507)
+++ mpich2/trunk/src/include/mpiu_valgrind.h	2009-10-20 20:35:44 UTC (rev 5508)
@@ -41,27 +41,45 @@
 #  define MPIU_VG_MAKE_MEM_DEFINED(addr_,len_)         VALGRIND_MAKE_MEM_DEFINED((addr_),(len_))
 #  define MPIU_VG_MAKE_MEM_NOACCESS(addr_,len_)        VALGRIND_MAKE_MEM_NOACCESS((addr_),(len_))
 #  define MPIU_VG_MAKE_MEM_UNDEFINED(addr_,len_)       VALGRIND_MAKE_MEM_UNDEFINED((addr_),(len_))
-#  define MPIU_VG_CHECK_MEM_IS_DEFINED(addr_,len_) VALGRIND_CHECK_MEM_IS_DEFINED((addr_),(len_))
+#  define MPIU_VG_CHECK_MEM_IS_DEFINED(addr_,len_)     VALGRIND_CHECK_MEM_IS_DEFINED((addr_),(len_))
 #  define MPIU_VG_CHECK_MEM_IS_ADDRESSABLE(addr_,len_) VALGRIND_CHECK_MEM_IS_ADDRESSABLE((addr_),(len_))
+#  define MPIU_VG_CREATE_BLOCK(addr_,len_,desc_)       VALGRIND_CREATE_BLOCK((addr_),(len_),(desc_))
+#  define MPIU_VG_RUNNING_ON_VALGRIND()                RUNNING_ON_VALGRIND
 #  if defined(HAVE_MACRO_VA_ARGS)
 #    define MPIU_VG_PRINTF_BACKTRACE(...) VALGRIND_PRINTF_BACKTRACE(__VA_ARGS__)
 #  else
 #    define MPIU_VG_PRINTF_BACKTRACE VALGRIND_PRINTF_BACKTRACE
 #  endif
-#else
-#  define MPIU_VG_MAKE_MEM_DEFINED(addr_,len_)
-#  define MPIU_VG_MAKE_MEM_NOACCESS(addr_,len_)
-#  define MPIU_VG_MAKE_MEM_UNDEFINED(addr_,len_)
-#  define MPIU_VG_CHECK_MEM_IS_DEFINED(addr_,len_)
-#  define MPIU_VG_CHECK_MEM_IS_ADDRESSABLE(addr_,len_)
+
+/* custom allocator client requests, you probably shouldn't use these unless you
+ * really know what you are doing */
+#  define MPIU_VG_CREATE_MEMPOOL(pool, rzB, is_zeroed) VALGRIND_CREATE_MEMPOOL((pool), (rzB), (is_zeroed))
+#  define MPIU_VG_DESTROY_MEMPOOL(pool)                VALGRIND_DESTROY_MEMPOOL((pool))
+#  define MPIU_VG_MEMPOOL_ALLOC(pool, addr, size)      VALGRIND_MEMPOOL_ALLOC((pool), (addr), (size))
+#  define MPIU_VG_MEMPOOL_FREE(pool, addr)             VALGRIND_MEMPOOL_FREE((pool), (addr))
+
+#else /* !defined(MPIU_VG_AVAILABLE) */
+#  define MPIU_VG_MAKE_MEM_DEFINED(addr_,len_)         do{}while(0)
+#  define MPIU_VG_MAKE_MEM_NOACCESS(addr_,len_)        do{}while(0)
+#  define MPIU_VG_MAKE_MEM_UNDEFINED(addr_,len_)       do{}while(0)
+#  define MPIU_VG_CHECK_MEM_IS_DEFINED(addr_,len_)     do{}while(0)
+#  define MPIU_VG_CHECK_MEM_IS_ADDRESSABLE(addr_,len_) do{}while(0)
+#  define MPIU_VG_CREATE_BLOCK(addr_,len_,desc_)       do{}while(0)
+#  define MPIU_VG_RUNNING_ON_VALGRIND()                (0)/*always false*/
 #  if defined(HAVE_MACRO_VA_ARGS)
-#    define MPIU_VG_PRINTF_BACKTRACE(...)
+#    define MPIU_VG_PRINTF_BACKTRACE(...)              do{}while(0)
 #  else
 #    define MPIU_VG_PRINTF_BACKTRACE MPIU_VG_printf_do_nothing_func
 static inline void MPIU_VG_printf_do_nothing_func(char *fmt, ...)
 {
     /* do nothing */
 }
+
+#  define MPIU_VG_CREATE_MEMPOOL(pool, rzB, is_zeroed) do{}while(0)
+#  define MPIU_VG_DESTROY_MEMPOOL(pool)                do{}while(0)
+#  define MPIU_VG_MEMPOOL_ALLOC(pool, addr, size)      do{}while(0)
+#  define MPIU_VG_MEMPOOL_FREE(pool, addr)             do{}while(0)
+
 #  endif
 #endif /* defined(MPIU_VG_AVAILABLE) */