Merge pull request #3370 from alinask/topic/v2x_ucx_yalla_fix_msg_release

hppritcha · web-flow · commit a9ba4639c256 · 2017-04-21T07:41:28.000-06: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
@@ -222,7 +222,7 @@ static inline int PML_YALLA_SET_RECV_STATUS(mxm_recv_req_t *_rreq,
 #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
`@@ -222,7 +222,7 @@ static inline int PML_YALLA_SET_RECV_STATUS(mxm_recv_req_t *_rreq,`
`222`	`222`	`#define PML_YALLA_MESSAGE_RELEASE(_message) \`
`223`	`223`	`{ \`
`224`	`224`	`ompi_message_return(*(_message)); \`
`225`		`- *(_message) = NULL; \`
	`225`	`+ *(_message) = MPI_MESSAGE_NULL; \`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`#endif /* PML_YALLA_REQUEST_H_ */`