minor ugni btl code cleanup

This commit was SVN r25618.

ompi/mca/btl/ugni/btl_ugni_component.c

@@ -413,8 +413,8 @@ mca_btl_ugni_smsg_process (mca_btl_base_endpoint_t *ep)
 
             break;
         default:
+            BTL_ERROR(("unknown tag %d\n", tag));
             break;
-/*             BTL_ERROR(("unknown tag %d\n", tag)); */
         }
 
         rc = GNI_SmsgRelease (ep->common->ep_handle);
@@ -577,9 +577,7 @@ mca_btl_ugni_progress_smsg (mca_btl_ugni_module_t *btl)
 static inline int
 mca_btl_ugni_progress_bte (mca_btl_ugni_module_t *btl)
 {
-    (void) ompi_common_ugni_process_completed_post (btl->device, btl->bte_local_cq);
- 
-    return 1;
+    return ompi_common_ugni_process_completed_post (btl->device, btl->bte_local_cq);
 }
 
 static int
@@ -589,7 +587,6 @@ mca_btl_ugni_retry_failed (mca_btl_ugni_module_t *btl)
     opal_list_item_t *item;
 
     while (count-- && NULL != (item = opal_list_remove_first (&btl->failed_frags))) {
-        fprintf (stderr, "retrying frag %p\n", (void *) item);
         mca_btl_ugni_post_frag_complete ((void *) item, OMPI_SUCCESS);
     }
 
@@ -600,7 +597,7 @@ static int
 mca_btl_ugni_component_progress (void)
 {
     mca_btl_ugni_module_t *btl;
-    unsigned int i, j, k;
+    unsigned int i;
     int count;
 
     count = ompi_common_ugni_progress ();
@@ -611,13 +608,8 @@ mca_btl_ugni_component_progress (void)
         mca_btl_ugni_retry_failed (btl);
 
         count += mca_btl_ugni_progress_datagram (btl);
-        for (j = 0 ; j < 2 ; ++j) {
-            for (k = 0 ; k < 5 ; ++k) {
-                count += mca_btl_ugni_progress_smsg (btl);
-            }
-
-            count += mca_btl_ugni_progress_bte (btl);
-        }
+        count += mca_btl_ugni_progress_smsg (btl);
+        count += mca_btl_ugni_progress_bte (btl);
     }
 
     return count;

ompi/mca/btl/ugni/btl_ugni_module.c

@@ -182,18 +182,10 @@ mca_btl_ugni_module_setup_mpools (mca_btl_ugni_module_t *ugni_module)
     mbox_increment = nprocs;
 
     if (nprocs * mca_btl_ugni_smsg_mbox_size > 2 * 1024 * 1024) {
-        /* allocate at most 2 MB at a time */
+        /* allocate at most 2 MB at a time (TODO: make this a mca param?) */
         mbox_increment = (int) (2.0 * 1024.0 * 1024.0 / (float)mca_btl_ugni_smsg_mbox_size);
     }
 
-    if (nprocs < 1024) {
-        mbox_increment = nprocs / 2;
-    } else if (nprocs < 16384) {
-        mbox_increment = nprocs / 10;
-    } else {
-        mbox_increment = nprocs / 40;
-    }
-
     rc = ompi_free_list_init_new (&ugni_module->smsg_mboxes,
                                   sizeof (mca_btl_ugni_smsg_mbox_t), 64,
                                   OBJ_CLASS(mca_btl_ugni_smsg_mbox_t),

ompi/mca/btl/ugni/btl_ugni_sendi.c

@@ -77,10 +77,9 @@ int mca_btl_ugni_sendi (struct mca_btl_base_module_t *btl,
 
     header_size += sizeof (frag->hdr[0]);
 
-    /* check endpoint state */
+    /* send message */
     rc = GNI_SmsgSendWTag (endpoint->common->ep_handle, frag->hdr, header_size,
-                           data_ptr, payload_size, msg_id,
-                           MCA_BTL_UGNI_TAG_SEND);
+                           data_ptr, payload_size, msg_id, MCA_BTL_UGNI_TAG_SEND);
     if (OPAL_UNLIKELY(GNI_RC_SUCCESS != rc)) {
         BTL_VERBOSE(("GNI_SmsgSendWTag failed with rc = %d", rc));
         MCA_BTL_UGNI_FRAG_RETURN (frag);