additional macros for csum

This commit was SVN r9293.

ompi/datatype/convertor.c

@@ -85,7 +85,7 @@ inline int32_t ompi_convertor_pack( ompi_convertor_t* pConv,
                                     struct iovec* iov, uint32_t* out_size,
                                     size_t* max_data, int32_t* freeAfter )
 {
-    pConv->checksum = 1;
+    pConv->checksum = OMPI_CSUM_ZERO;
     pConv->csum_ui1 = 0;
     pConv->csum_ui2 = 0;
 
@@ -109,7 +109,7 @@ inline int32_t ompi_convertor_unpack( ompi_convertor_t* pConv,
                                       struct iovec* iov, uint32_t* out_size,
                                       size_t* max_data, int32_t* freeAfter )
 {
-    pConv->checksum = 1;
+    pConv->checksum = OMPI_CSUM_ZERO;
     pConv->csum_ui1 = 0;
     pConv->csum_ui2 = 0;
 

ompi/datatype/datatype_internal.h

@@ -293,32 +293,36 @@ static inline int GET_FIRST_NON_LOOP( const dt_elem_desc_t* _pElem )
  * use ADLER32 algorithm.
  */
 
-#define OMPI_REQUIRE_DATA_VALIDATION 0
+#define OMPI_REQUIRE_DATA_VALIDATION 1
 
 #if OMPI_REQUIRE_DATA_VALIDATION
 #include "opal/util/crc.h"
 
 #define MEMCPY_CSUM( DST, SRC, BLENGTH, CONVERTOR ) \
 do { \
-    /*opal_output( 0, "memcpy dest = %p src = %p length = %d\n", (void*)(DST), (void*)(SRC), (int)(BLENGTH) ); */\
     (CONVERTOR)->checksum += opal_bcopy_uicsum_partial( (SRC), (DST), (BLENGTH), (BLENGTH), &(CONVERTOR)->csum_ui1, &(CONVERTOR)->csum_ui2 ); \
 } while (0)
 
 #define COMPUTE_CSUM( SRC, BLENGTH, CONVERTOR ) \
 do { \
-    /*opal_output( 0, "memcpy dest = %p src = %p length = %d\n", (void*)(DST), (void*)(SRC), (int)(BLENGTH) ); */\
     (CONVERTOR)->checksum += opal_uicsum_partial( (SRC), (BLENGTH), &(CONVERTOR)->csum_ui1, &(CONVERTOR)->csum_ui2 ); \
 } while (0)
 
+#define OMPI_CSUM( SRC, BLENGTH ) \
+    opal_uicsum( (SRC), (BLENGTH) )
+
+#define OMPI_CSUM_ZERO 0
+
 #else
 
 #define MEMCPY_CSUM( DST, SRC, BLENGTH, CONVERTOR ) \
 do { \
-    /*opal_output( 0, "memcpy dest = %p src = %p length = %d\n", (void*)(DST), (void*)(SRC), (int)(BLENGTH) ); */\
     memcpy( (DST), (SRC), (BLENGTH) ); \
 } while (0)
 
 #define COMPUTE_CSUM( SRC, BLENGTH, CONVERTOR )
+#define OMPI_CSUM_ZERO 0
+#define OMPI_CSUM( SRC, BLENGTH)  OMPI_CSUM_ZERO
 
 #endif