merge in changes from 1.0

This commit was SVN r7728.

ompi/mca/btl/gm/btl_gm_component.c

@@ -157,6 +157,8 @@ int mca_btl_gm_component_open(void)
 #else
     mca_btl_gm_module.super.btl_flags = MCA_BTL_FLAGS_SEND;
 #endif
+    mca_btl_gm_module.super.btl_bandwidth  = 
+        mca_btl_gm_param_register_int("bandwidth", 250); 
 
     /* compute the eager frag size */
     mca_btl_gm_component.gm_eager_frag_size =
@@ -496,9 +498,15 @@ mca_btl_gm_component_init (int *num_btl_modules,
 
 int mca_btl_gm_component_progress()
 {
+    static int32_t inprogress = 0;
     int count = 0;
     size_t i;
     
+    if(OPAL_THREAD_ADD32(&inprogress, 1) != 1) {
+        OPAL_THREAD_ADD32(&inprogress, -1);
+        return OMPI_SUCCESS;
+    }
+
     for( i = 0; i < mca_btl_gm_component.gm_num_btls; ) {
         mca_btl_gm_module_t* btl = mca_btl_gm_component.gm_btls[i];
         gm_recv_event_t* event = gm_receive(btl->port);
@@ -546,6 +554,7 @@ int mca_btl_gm_component_progress()
                 break;
         }
     }
+    OPAL_THREAD_ADD32(&inprogress, -1);
     return count;
 }
 

ompi/mca/btl/mvapi/btl_mvapi_component.c

@@ -207,6 +207,8 @@ int mca_btl_mvapi_component_open(void)
     mca_btl_mvapi_module.super.btl_flags  = 
         mca_btl_mvapi_param_register_int("flags", 
                                       MCA_BTL_FLAGS_PUT|MCA_BTL_FLAGS_GET); 
+    mca_btl_mvapi_module.super.btl_bandwidth = 
+        mca_btl_mvapi_param_register_int("bandwidth",  800);
     
     param = mca_base_param_find("mpi", NULL, "leave_pinned"); 
     mca_base_param_lookup_int(param, &value); 
@@ -372,7 +374,6 @@ mca_btl_base_module_t** mca_btl_mvapi_component_init(int *num_btl_modules,
                  
                  opal_list_append(&btl_list, (opal_list_item_t*) ib_selected);
                  mca_btl_mvapi_component.ib_num_btls ++; 
-                 
             } 
         }
  

ompi/mca/pml/ob1/pml_ob1_sendreq.c

@@ -715,7 +715,7 @@ int mca_pml_ob1_send_request_schedule(mca_pml_ob1_send_request_t* sendreq)
                  * previously assigned)
                  */
                 } else {
-                    size = (bml_btl->btl_weight * bytes_remaining) / 100;
+                    size = (size_t)(bml_btl->btl_weight * bytes_remaining);
                 } 
 
                 /* makes sure that we don't exceed BTL max send size */