oshmem: ucx: check status only if configured --with-oshmem-param-check

alex-mikheev · alex-mikheev · commit 864904e8ab8b · 2016-11-10T11:29:03.000+02:00
Current standard says that behaviour in the case of error is undefined

Signed-off-by: Alex Mikheev &lt;alexm@mellanox.com&gt;
diff --git a/oshmem/mca/spml/ucx/spml_ucx.h b/oshmem/mca/spml/ucx/spml_ucx.h
@@ -135,12 +135,20 @@ mca_spml_ucx_get_mkey(int pe, void *va, void **rva)
 
 static inline int ucx_status_to_oshmem(ucs_status_t status)
 {
+#if OSHMEM_PARAM_CHECK == 1
     return OPAL_LIKELY(UCS_OK == status) ? OSHMEM_SUCCESS : OSHMEM_ERROR;
+#else
+    return OSHMEM_SUCCESS;
+#endif
 }
 
 static inline int ucx_status_to_oshmem_nb(ucs_status_t status)
 {
+#if OSHMEM_PARAM_CHECK == 1
     return OPAL_LIKELY(status >= 0) ? OSHMEM_SUCCESS : OSHMEM_ERROR;
+#else
+    return OSHMEM_SUCCESS;
+#endif
 }
 
 END_C_DECLS

Original file line number	Diff line number	Diff line change
`@@ -135,12 +135,20 @@ mca_spml_ucx_get_mkey(int pe, void va, void *rva)`
`135`	`135`
`136`	`136`	`static inline int ucx_status_to_oshmem(ucs_status_t status)`
`137`	`137`	`{`
	`138`	`+#if OSHMEM_PARAM_CHECK == 1`
`138`	`139`	`return OPAL_LIKELY(UCS_OK == status) ? OSHMEM_SUCCESS : OSHMEM_ERROR;`
	`140`	`+#else`
	`141`	`+ return OSHMEM_SUCCESS;`
	`142`	`+#endif`
`139`	`143`	`}`
`140`	`144`
`141`	`145`	`static inline int ucx_status_to_oshmem_nb(ucs_status_t status)`
`142`	`146`	`{`
	`147`	`+#if OSHMEM_PARAM_CHECK == 1`
`143`	`148`	`return OPAL_LIKELY(status >= 0) ? OSHMEM_SUCCESS : OSHMEM_ERROR;`
	`149`	`+#else`
	`150`	`+ return OSHMEM_SUCCESS;`
	`151`	`+#endif`
`144`	`152`	`}`
`145`	`153`
`146`	`154`	`END_C_DECLS`