Various cleanups and typos.

This commit was SVN r21765.

ompi/mca/pml/ob1/pml_ob1_recvfrag.c

@@ -99,7 +99,8 @@ match_one(mca_btl_base_module_t *btl,
 void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl, 
                                           mca_btl_base_tag_t tag,
                                           mca_btl_base_descriptor_t* des,
-                                          void* cbdata ) { 
+                                          void* cbdata )
+{ 
     mca_btl_base_segment_t* segments = des->des_dst;
     mca_pml_ob1_match_hdr_t* hdr = (mca_pml_ob1_match_hdr_t*)segments->seg_addr.pval;
     ompi_communicator_t *comm_ptr;
@@ -244,11 +245,8 @@ void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl,
 void mca_pml_ob1_recv_frag_callback_rndv(mca_btl_base_module_t* btl, 
                                          mca_btl_base_tag_t tag,
                                          mca_btl_base_descriptor_t* des,
-                                         void* cbdata ) { 
-    
-    
-    
-    
+                                         void* cbdata )
+{ 
     mca_btl_base_segment_t* segments = des->des_dst;
     mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval;
     
@@ -264,13 +262,14 @@ void mca_pml_ob1_recv_frag_callback_rndv(mca_btl_base_module_t* btl,
 void mca_pml_ob1_recv_frag_callback_rget(mca_btl_base_module_t* btl, 
                                          mca_btl_base_tag_t tag,
                                          mca_btl_base_descriptor_t* des,
-                                         void* cbdata ) { 
+                                         void* cbdata )
+{ 
     mca_btl_base_segment_t* segments = des->des_dst;
     mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval;
     
     if( OPAL_UNLIKELY(segments->seg_len < sizeof(mca_pml_ob1_common_hdr_t)) ) {
         return;
-     }
+    }
     ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_RGET);
     mca_pml_ob1_recv_frag_match(btl, &hdr->hdr_match, segments,
                                 des->des_dst_cnt, MCA_PML_OB1_HDR_TYPE_RGET);
@@ -282,7 +281,8 @@ void mca_pml_ob1_recv_frag_callback_rget(mca_btl_base_module_t* btl,
 void mca_pml_ob1_recv_frag_callback_ack(mca_btl_base_module_t* btl, 
                                         mca_btl_base_tag_t tag,
                                         mca_btl_base_descriptor_t* des,
-                                        void* cbdata ) { 
+                                        void* cbdata )
+{ 
     mca_btl_base_segment_t* segments = des->des_dst;
     mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval;
     mca_pml_ob1_send_request_t* sendreq;
@@ -483,21 +483,16 @@ match_one(mca_btl_base_module_t *btl,
     } while(true);
 }
 
-static mca_pml_ob1_recv_frag_t *check_cantmatch_for_match(
-        mca_pml_ob1_comm_proc_t *proc)
+static mca_pml_ob1_recv_frag_t* check_cantmatch_for_match(mca_pml_ob1_comm_proc_t *proc)
 {
-    /* local parameters */
     mca_pml_ob1_recv_frag_t *frag;
 
     /* search the list for a fragment from the send with sequence
      * number next_msg_seq_expected
      */
-    for(frag = (mca_pml_ob1_recv_frag_t *) 
-            opal_list_get_first(&proc->frags_cant_match);
-        frag != (mca_pml_ob1_recv_frag_t *)
-            opal_list_get_end(&proc->frags_cant_match);
-        frag = (mca_pml_ob1_recv_frag_t *) 
-            opal_list_get_next(frag))
+    for(frag = (mca_pml_ob1_recv_frag_t*)opal_list_get_first(&proc->frags_cant_match);
+        frag != (mca_pml_ob1_recv_frag_t*)opal_list_get_end(&proc->frags_cant_match);
+        frag = (mca_pml_ob1_recv_frag_t*)opal_list_get_next(frag))
     {
         mca_pml_ob1_match_hdr_t* hdr = &frag->hdr.hdr_match;
         /*

ompi/mca/pml/ob1/pml_ob1_recvreq.c

@@ -596,9 +596,8 @@ void mca_pml_ob1_recv_request_progress_match( mca_pml_ob1_recv_request_t* recvre
                                               mca_btl_base_segment_t* segments,
                                               size_t num_segments )
 {
-    size_t bytes_received = 0;
+    size_t bytes_received = 0, data_offset = 0;
     size_t bytes_delivered __opal_attribute_unused__; /* is being set to zero in MCA_PML_OB1_RECV_REQUEST_UNPACK */
-    size_t data_offset = 0;
     mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval;
 
     MCA_PML_OB1_COMPUTE_SEGMENT_LENGTH( segments, num_segments,

ompi/mca/pml/ob1/pml_ob1_recvreq.h

@@ -230,7 +230,7 @@ static inline void recv_req_matched(mca_pml_ob1_recv_request_t *req,
         }
 #endif  /* OPAL_ENABLE_HETEROGENEOUS_SUPPORT */
         PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_REQ_XFER_BEGIN,
-                &req->req_recv.req_base, PERUSE_RECV);
+                                &req->req_recv.req_base, PERUSE_RECV);
     }
 }
 

ompi/mca/pml/ob1/pml_ob1_sendreq.h

@@ -226,7 +226,7 @@ send_request_pml_complete(mca_pml_ob1_send_request_t *sendreq)
 
     if(sendreq->req_send.req_bytes_packed > 0) {
         PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_XFER_END,
-                &(sendreq->req_send.req_base), PERUSE_SEND);
+                                 &(sendreq->req_send.req_base), PERUSE_SEND);
     }
 
     /* return mpool resources */