UCP:rndv multirail support infrastructure + protocol (2)

- code beautify
openucx · Oct 9, 2017 · bac9ce8 · bac9ce8
1 parent 3dd33cc
commit bac9ce8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/ucp/core/ucp_request.c b/src/ucp/core/ucp_request.c
@@ -175,8 +175,7 @@ void ucp_iov_buffer_memh_dereg(uct_md_h uct_md, uct_mem_h *memh,
 UCS_PROFILE_FUNC(ucs_status_t, ucp_request_memory_reg,
                  (context, rsc_index, buffer, length, datatype, state),
                  ucp_context_t *context, ucp_rsc_index_t rsc_index, void *buffer,
-                 size_t length, ucp_datatype_t datatype,
-                 ucp_dt_state_t *state)
+                 size_t length, ucp_datatype_t datatype, ucp_dt_state_t *state)
 {
     ucp_rsc_index_t mdi = context->tl_rscs[rsc_index].md_index;
     uct_md_h uct_md     = context->tl_mds[mdi].md;

diff --git a/src/ucp/core/ucp_request.h b/src/ucp/core/ucp_request.h
@@ -201,8 +201,7 @@ ucs_status_t ucp_request_send_buffer_reg(ucp_request_t *req, ucp_lane_index_t la
 void ucp_request_send_buffer_dereg(ucp_request_t *req, ucp_lane_index_t lane);
 
 ucs_status_t ucp_request_memory_reg(ucp_context_t *context, ucp_rsc_index_t rsc_index,
-                                    void *buffer, size_t length,
-                                    ucp_datatype_t datatype,
+                                    void *buffer, size_t length, ucp_datatype_t datatype,
                                     ucp_dt_state_t *state);
 
 void ucp_request_memory_dereg(ucp_context_t *context, ucp_rsc_index_t rsc_index,

diff --git a/src/ucp/tag/rndv.c b/src/ucp/tag/rndv.c
@@ -73,8 +73,8 @@ static size_t ucp_tag_rndv_pack_mrail_rkeys(ucp_request_t *sreq, void *rkey_buf,
     ucp_ep_t        *ep      = sreq->send.ep;
     ucp_dt_state_t  *state   = &sreq->send.state;
     size_t           packet  = 0;
-    int              i;
     int              cnt     = 0;
+    int              i;
     ucp_lane_index_t lane;
 
     ucs_assert(UCP_DT_IS_CONTIG(sreq->send.datatype));
@@ -355,8 +355,8 @@ UCS_PROFILE_FUNC(ucs_status_t, ucp_proto_progress_rndv_get_zcopy, (self),
                    (void*)rndv_req->send.buffer + offset, length);
 
     if ((rndv_req->send.rndv_get.use_mrail) &&
-       ((ucp_request_is_empty_rail(&rndv_req->send.state, rndv_req->send.rndv_get.rail_idx)) ||
-        (rndv_req->send.rndv_get.rail_idx >= UCP_MAX_RAILS))) {
+        ((ucp_request_is_empty_rail(&rndv_req->send.state, rndv_req->send.rndv_get.rail_idx)) ||
+         (rndv_req->send.rndv_get.rail_idx >= UCP_MAX_RAILS))) {
         rndv_req->send.rndv_get.rail_idx = 0;
     }
 
@@ -727,7 +727,7 @@ static void ucp_rndv_prepare_zcopy_send_buffer(ucp_request_t *sreq, ucp_ep_h ep)
         sreq->send.state.dt.contig.memh = UCT_MEM_HANDLE_NULL;
         ucp_request_clear_rails(&sreq->send.state);
     } else if ((ucp_ep_is_rndv_lane_present(ep, 0)) &&
-        (ucp_ep_get_am_lane(ep) != ucp_ep_get_rndv_get_lane(ep, 0))) {
+               (ucp_ep_get_am_lane(ep) != ucp_ep_get_rndv_get_lane(ep, 0))) {
         /* dereg the original send request since we are going to send on the AM lane next */
         ucp_rndv_rma_request_send_buffer_dereg(sreq);
         sreq->send.state.dt.contig.memh = UCT_MEM_HANDLE_NULL;