[mpich2-commits] r6732 - in mpich2/trunk/src/mpl: include src

[goodell at mcs.anl.gov]

Author: goodell
Date: 2010-05-24 15:56:21 -0500 (Mon, 24 May 2010)
New Revision: 6732

Modified:
   mpich2/trunk/src/mpl/include/mpl_valgrind.h
   mpich2/trunk/src/mpl/src/mpltrmem.c
Log:
remove "MPICH_" cpp macro dependency in MPL

MPICH2 uses the same logic still to enable valgrind support, it just is
now entirely located outside of MPL.

Reviewed by buntinas at .

Modified: mpich2/trunk/src/mpl/include/mpl_valgrind.h
===================================================================
--- mpich2/trunk/src/mpl/include/mpl_valgrind.h	2010-05-24 20:56:20 UTC (rev 6731)
+++ mpich2/trunk/src/mpl/include/mpl_valgrind.h	2010-05-24 20:56:21 UTC (rev 6732)
@@ -33,8 +33,7 @@
 #undef MPL_VG_AVAILABLE
 
 #if !defined(HAVE_BROKEN_VALGRIND) && defined(MPL_VG_ENABLED)
-/* FIXME "MPICH_" shouldn't appear anywhere here */
-#  if defined(MPICH_DEBUG_MEMINIT) && !defined(NVALGRIND)
+#  if !defined(NVALGRIND)
 #    if defined(MPL_HAVE_VALGRIND_H) && defined(MPL_HAVE_MEMCHECK_H)
 #      include <valgrind.h>
 #      include <memcheck.h>

Modified: mpich2/trunk/src/mpl/src/mpltrmem.c
===================================================================
--- mpich2/trunk/src/mpl/src/mpltrmem.c	2010-05-24 20:56:20 UTC (rev 6731)
+++ mpich2/trunk/src/mpl/src/mpltrmem.c	2010-05-24 20:56:21 UTC (rev 6732)
@@ -4,6 +4,10 @@
  *      See COPYRIGHT in top-level directory.
  */
 
+/* Always enable valgrind macros (if possible) in this file.  If these functions
+ * are used, the caller is concerned about correctness, not performance. */
+#define MPL_VG_ENABLED 1
+
 #include "mpl.h"
 
 #ifdef malloc