Merge pull request #975 from jsquyres/pr/v2.x/minor-memchecker-fix

jsquyres · jsquyres · commit 88d8a8d751e2 · 2016-02-18T16:00:21.000-05:00
v2.x: memchecker.h: fix memchecker no-data case
diff --git a/ompi/include/ompi/memchecker.h b/ompi/include/ompi/memchecker.h
@@ -10,6 +10,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
  *
+ * Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -100,6 +101,10 @@ static inline int memchecker_call (int (*f)(void *, size_t), const void * addr,
         return OMPI_SUCCESS;
     }
 
+    if ((0 == count) || (0 == datatype->super.size)) {
+        return OMPI_SUCCESS;
+    }
+
     if( datatype->super.size == (size_t) (datatype->super.true_ub - datatype->super.true_lb) ) {
         /*  We have a contiguous type. */
         f( (void*)addr , datatype->super.size * count );

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`* and Technology (RIST). All rights reserved.`
`11`	`11`	`* Copyright (c) 2014 Intel, Inc. All rights reserved.`
`12`	`12`	`*`
	`13`	`+ * Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.`
`13`	`14`	`* $COPYRIGHT$`
`14`	`15`	`*`
`15`	`16`	`* Additional copyrights may follow`
`@@ -100,6 +101,10 @@ static inline int memchecker_call (int (f)(void , size_t), const void * addr,`
`100`	`101`	`return OMPI_SUCCESS;`
`101`	`102`	`}`
`102`	`103`
	`104`	`+ if ((0 == count) \|\| (0 == datatype->super.size)) {`
	`105`	`+ return OMPI_SUCCESS;`
	`106`	`+ }`
	`107`	`+`
`103`	`108`	`if( datatype->super.size == (size_t) (datatype->super.true_ub - datatype->super.true_lb) ) {`
`104`	`109`	`/* We have a contiguous type. */`
`105`	`110`	`f( (void)addr , datatype->super.size count );`