Merge pull request #3346 from alinask/topic/ucx_yalla_fix_msg_release

yosefe · web-flow · commit 3081d7e626c0 · 2017-04-13T16:35:06.000+03:00
PML/UCX/YALLA: Fix the message release call.
diff --git a/ompi/mca/pml/ucx/pml_ucx_request.h b/ompi/mca/pml/ucx/pml_ucx_request.h
@@ -89,7 +89,7 @@ enum {
 #define PML_UCX_MESSAGE_RELEASE(_message) \
     { \
         ompi_message_return(*(_message)); \
-        *(_message) = NULL; \
+        *(_message) = MPI_MESSAGE_NULL; \
     }
 
 
diff --git a/ompi/mca/pml/yalla/pml_yalla_request.h b/ompi/mca/pml/yalla/pml_yalla_request.h
@@ -212,7 +212,7 @@ static inline mca_pml_yalla_send_request_t* MCA_PML_YALLA_SREQ_INIT(void *_buf,
 #define PML_YALLA_MESSAGE_RELEASE(_message) \
     { \
         ompi_message_return(*(_message)); \
-        *(_message) = NULL; \
+        *(_message) = MPI_MESSAGE_NULL; \
     }
 
 #endif /* PML_YALLA_REQUEST_H_ */

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ enum {`
`89`	`89`	`#define PML_UCX_MESSAGE_RELEASE(_message) \`
`90`	`90`	`{ \`
`91`	`91`	`ompi_message_return(*(_message)); \`
`92`		`- *(_message) = NULL; \`
	`92`	`+ *(_message) = MPI_MESSAGE_NULL; \`
`93`	`93`	`}`
`94`	`94`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ static inline mca_pml_yalla_send_request_t* MCA_PML_YALLA_SREQ_INIT(void *_buf,`
`212`	`212`	`#define PML_YALLA_MESSAGE_RELEASE(_message) \`
`213`	`213`	`{ \`
`214`	`214`	`ompi_message_return(*(_message)); \`
`215`		`- *(_message) = NULL; \`
	`215`	`+ *(_message) = MPI_MESSAGE_NULL; \`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`#endif /* PML_YALLA_REQUEST_H_ */`