@@ -618,11 +618,11 @@ ompi_mtl_ofi_post_recv_excid_buffer(bool blocking, struct ompi_communicator_t *c
618
618
ofi_req -> comm = comm ;
619
619
620
620
OFI_RETRY_UNTIL_DONE (fi_recv (ompi_mtl_ofi .ofi_ctxt [0 ].rx_ep ,
621
- start ,
622
- length ,
623
- NULL ,
624
- FI_ADDR_UNSPEC ,
625
- (void * )& ofi_req -> ctx ), ret );
621
+ start ,
622
+ length ,
623
+ NULL ,
624
+ FI_ADDR_UNSPEC ,
625
+ (void * )& ofi_req -> ctx ), ret );
626
626
if (OPAL_UNLIKELY (0 > ret )) {
627
627
if (NULL != ofi_req -> buffer ) {
628
628
free (ofi_req -> buffer );
@@ -671,13 +671,13 @@ ompi_mtl_ofi_ssend_recv(ompi_mtl_ofi_request_t *ack_req,
671
671
ofi_req -> completion_count += 1 ;
672
672
673
673
OFI_RETRY_UNTIL_DONE (fi_trecv (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].rx_ep ,
674
- NULL ,
675
- 0 ,
676
- NULL ,
677
- * src_addr ,
678
- * match_bits | ompi_mtl_ofi .sync_send_ack ,
679
- 0 , /* Exact match, no ignore bits */
680
- (void * ) & ack_req -> ctx ), ret );
674
+ NULL ,
675
+ 0 ,
676
+ NULL ,
677
+ * src_addr ,
678
+ * match_bits | ompi_mtl_ofi .sync_send_ack ,
679
+ 0 , /* Exact match, no ignore bits */
680
+ (void * ) & ack_req -> ctx ), ret );
681
681
if (OPAL_UNLIKELY (0 > ret )) {
682
682
opal_output_verbose (1 , opal_common_ofi .output ,
683
683
"%s:%d: fi_trecv failed: %s(%zd)" ,
@@ -770,15 +770,15 @@ ompi_mtl_ofi_send_excid(struct mca_mtl_base_module_t *mtl,
770
770
if (ompi_mtl_ofi .max_inject_size >= length ) {
771
771
if (ofi_cq_data ) {
772
772
OFI_RETRY_UNTIL_DONE (fi_injectdata (ompi_mtl_ofi .ofi_ctxt [0 ].tx_ep ,
773
- start ,
774
- length ,
775
- comm -> c_my_rank ,
776
- sep_peer_fiaddr ), ret );
773
+ start ,
774
+ length ,
775
+ comm -> c_my_rank ,
776
+ sep_peer_fiaddr ), ret );
777
777
} else {
778
778
OFI_RETRY_UNTIL_DONE (fi_inject (ompi_mtl_ofi .ofi_ctxt [0 ].tx_ep ,
779
- start ,
780
- length ,
781
- sep_peer_fiaddr ), ret );
779
+ start ,
780
+ length ,
781
+ sep_peer_fiaddr ), ret );
782
782
}
783
783
if (OPAL_UNLIKELY (0 > ret )) {
784
784
MTL_OFI_LOG_FI_ERR (ret ,
@@ -790,19 +790,19 @@ ompi_mtl_ofi_send_excid(struct mca_mtl_base_module_t *mtl,
790
790
ofi_req -> completion_count = 1 ;
791
791
if (ofi_cq_data ) {
792
792
OFI_RETRY_UNTIL_DONE (fi_senddata (ompi_mtl_ofi .ofi_ctxt [0 ].tx_ep ,
793
- start ,
794
- length ,
795
- NULL ,
796
- comm -> c_my_rank ,
797
- sep_peer_fiaddr ,
798
- (void * ) & ofi_req -> ctx ), ret );
793
+ start ,
794
+ length ,
795
+ NULL ,
796
+ comm -> c_my_rank ,
797
+ sep_peer_fiaddr ,
798
+ (void * ) & ofi_req -> ctx ), ret );
799
799
} else {
800
800
OFI_RETRY_UNTIL_DONE (fi_send (ompi_mtl_ofi .ofi_ctxt [0 ].tx_ep ,
801
- start ,
802
- length ,
803
- NULL ,
804
- sep_peer_fiaddr ,
805
- (void * ) & ofi_req -> ctx ), ret );
801
+ start ,
802
+ length ,
803
+ NULL ,
804
+ sep_peer_fiaddr ,
805
+ (void * ) & ofi_req -> ctx ), ret );
806
806
}
807
807
if (OPAL_UNLIKELY (0 > ret )) {
808
808
MTL_OFI_LOG_FI_ERR (ret ,
@@ -934,11 +934,11 @@ ompi_mtl_ofi_send_generic(struct mca_mtl_base_module_t *mtl,
934
934
&& (ompi_mtl_ofi .max_inject_size >= length )) {
935
935
if (ofi_cq_data ) {
936
936
OFI_RETRY_UNTIL_DONE (fi_tinjectdata (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
937
- start ,
938
- length ,
939
- comm -> c_my_rank ,
940
- sep_peer_fiaddr ,
941
- match_bits ), ret );
937
+ start ,
938
+ length ,
939
+ comm -> c_my_rank ,
940
+ sep_peer_fiaddr ,
941
+ match_bits ), ret );
942
942
} else {
943
943
OFI_RETRY_UNTIL_DONE (fi_tinject (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
944
944
start ,
@@ -966,13 +966,13 @@ ompi_mtl_ofi_send_generic(struct mca_mtl_base_module_t *mtl,
966
966
ofi_req .completion_count += 1 ;
967
967
if (ofi_cq_data ) {
968
968
OFI_RETRY_UNTIL_DONE (fi_tsenddata (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
969
- start ,
970
- length ,
971
- (NULL == ofi_req .mr ) ? NULL : ofi_req .mr -> mem_desc ,
972
- comm -> c_my_rank ,
973
- sep_peer_fiaddr ,
974
- match_bits ,
975
- (void * ) & ofi_req .ctx ), ret );
969
+ start ,
970
+ length ,
971
+ (NULL == ofi_req .mr ) ? NULL : ofi_req .mr -> mem_desc ,
972
+ comm -> c_my_rank ,
973
+ sep_peer_fiaddr ,
974
+ match_bits ,
975
+ (void * ) & ofi_req .ctx ), ret );
976
976
} else {
977
977
OFI_RETRY_UNTIL_DONE (fi_tsend (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
978
978
start ,
@@ -1074,7 +1074,7 @@ ompi_mtl_ofi_gen_ssend_ack(struct fi_cq_tagged_entry *wc,
1074
1074
tagged_msg .data = 0 ;
1075
1075
1076
1076
OFI_RETRY_UNTIL_DONE (fi_tsendmsg (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
1077
- & tagged_msg , 0 ), ret );
1077
+ & tagged_msg , 0 ), ret );
1078
1078
if (OPAL_UNLIKELY (0 > ret )) {
1079
1079
MTL_OFI_LOG_FI_ERR (ret , "fi_tsendmsg failed during ompi_mtl_ofi_gen_ssend_ack" );
1080
1080
ret = OMPI_ERROR ;
@@ -1220,13 +1220,13 @@ ompi_mtl_ofi_isend_generic(struct mca_mtl_base_module_t *mtl,
1220
1220
1221
1221
if (ofi_cq_data ) {
1222
1222
OFI_RETRY_UNTIL_DONE (fi_tsenddata (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
1223
- start ,
1224
- length ,
1225
- (NULL == ofi_req -> mr ) ? NULL : ofi_req -> mr -> mem_desc ,
1226
- comm -> c_my_rank ,
1227
- sep_peer_fiaddr ,
1228
- match_bits ,
1229
- (void * ) & ofi_req -> ctx ), ret );
1223
+ start ,
1224
+ length ,
1225
+ (NULL == ofi_req -> mr ) ? NULL : ofi_req -> mr -> mem_desc ,
1226
+ comm -> c_my_rank ,
1227
+ sep_peer_fiaddr ,
1228
+ match_bits ,
1229
+ (void * ) & ofi_req -> ctx ), ret );
1230
1230
} else {
1231
1231
OFI_RETRY_UNTIL_DONE (fi_tsend (ompi_mtl_ofi .ofi_ctxt [ctxt_id ].tx_ep ,
1232
1232
start ,
0 commit comments