usnic: minor code cleanups

Author: jsquyres

opal/mca/btl/usnic/btl_usnic.h

@@ -93,7 +93,7 @@ extern opal_rng_buff_t opal_btl_usnic_rand_buff;
 
 /* Set to >0 to randomly drop received frags.  The higher the number,
    the more frequent the drops. */
-#define WANT_RECV_FRAG_DROPS 0
+#define WANT_RECV_DROPS 0
 /* Set to >0 to randomly fail to send an ACK, mimicing a lost ACK.
    The higher the number, the more frequent the failed-to-send-ACK. */
 #define WANT_FAIL_TO_SEND_ACK 0
@@ -102,10 +102,10 @@ extern opal_rng_buff_t opal_btl_usnic_rand_buff;
    the failed-to-resend-frag. */
 #define WANT_FAIL_TO_RESEND_FRAG 0
 
-#if WANT_RECV_FRAG_DROPS > 0
-#define FAKE_RECV_FRAG_DROP (opal_rand(&opal_btl_usnic_rand_buff) < WANT_RECV_FRAG_DROPS)
+#if WANT_RECV_DROPS > 0
+#define FAKE_RECV_DROP (opal_rand(&opal_btl_usnic_rand_buff) < WANT_RECV_DROPS)
 #else
-#define FAKE_RECV_FRAG_DROP 0
+#define FAKE_RECV_DROP 0
 #endif
 
 #if WANT_FAIL_TO_SEND_ACK > 0

opal/mca/btl/usnic/btl_usnic_ack.c

@@ -252,6 +252,7 @@ opal_btl_usnic_ack_complete(opal_btl_usnic_module_t *module,
                                    opal_btl_usnic_ack_segment_t *ack)
 {
     opal_btl_usnic_ack_segment_return(module, ack);
+    ++module->mod_channels[ack->ss_channel].credits;
 }
 
 /*****************************************************************************/

opal/mca/btl/usnic/btl_usnic_component.c

@@ -1143,27 +1143,18 @@ static int usnic_handle_completion(
     case OPAL_BTL_USNIC_SEG_ACK:
         opal_btl_usnic_ack_complete(module,
                 (opal_btl_usnic_ack_segment_t *)seg);
-{ opal_btl_usnic_send_segment_t *sseg = (opal_btl_usnic_send_segment_t *)seg;
-++module->mod_channels[sseg->ss_channel].credits;
-}
         break;
 
     /**** Send of frag segment completion ****/
     case OPAL_BTL_USNIC_SEG_FRAG:
         opal_btl_usnic_frag_send_complete(module,
                 (opal_btl_usnic_frag_segment_t*)seg);
-{ opal_btl_usnic_send_segment_t *sseg = (opal_btl_usnic_send_segment_t *)seg;
-++module->mod_channels[sseg->ss_channel].credits;
-}
         break;
 
     /**** Send of chunk segment completion ****/
     case OPAL_BTL_USNIC_SEG_CHUNK:
         opal_btl_usnic_chunk_send_complete(module,
                 (opal_btl_usnic_chunk_segment_t*)seg);
-{ opal_btl_usnic_send_segment_t *sseg = (opal_btl_usnic_send_segment_t *)seg;
-++module->mod_channels[sseg->ss_channel].credits;
-}
         break;
 
     /**** Receive completions ****/

opal/mca/btl/usnic/btl_usnic_recv.c

@@ -77,7 +77,7 @@ void opal_btl_usnic_recv_call(opal_btl_usnic_module_t *module,
 
     /* Find out who sent this segment */
     endpoint = seg->rs_endpoint;
-    if (FAKE_RECV_FRAG_DROP || OPAL_UNLIKELY(NULL == endpoint)) {
+    if (FAKE_RECV_DROP || OPAL_UNLIKELY(NULL == endpoint)) {
         /* No idea who this was from, so drop it */
 #if MSGDEBUG1
         opal_output(0, "=== Unknown sender; dropped: seq %" UDSEQ,

opal/mca/btl/usnic/btl_usnic_send.c

@@ -66,6 +66,8 @@ opal_btl_usnic_frag_send_complete(opal_btl_usnic_module_t *module,
 
     /* see if this endpoint needs to be made ready-to-send */
     opal_btl_usnic_check_rts(frag->sf_endpoint);
+
+    ++module->mod_channels[sseg->ss_channel].credits;
 }
 
 /*
@@ -97,6 +99,8 @@ opal_btl_usnic_chunk_send_complete(opal_btl_usnic_module_t *module,
 
     /* see if this endpoint needs to be made ready-to-send */
     opal_btl_usnic_check_rts(frag->sf_endpoint);
+
+    ++module->mod_channels[sseg->ss_channel].credits;
 }
 
 /* Responsible for completing non-fastpath parts of a put or send operation,