- turn on eager rdma by default

This commit was SVN r9641.

ompi/mca/btl/mvapi/btl_mvapi_component.c

@@ -199,11 +199,11 @@ int mca_btl_mvapi_component_open(void)
                                       8,  &mca_btl_mvapi_component.srq_sd_max); 
 
     mca_btl_mvapi_param_register_int("use_eager_rdma", "user RDMA for eager messages", 
-            0, (int*) &mca_btl_mvapi_component.use_eager_rdma);
+            1, (int*) &mca_btl_mvapi_component.use_eager_rdma);
     if (mca_btl_mvapi_component.use_srq)
         mca_btl_mvapi_component.use_eager_rdma = 0;
     mca_btl_mvapi_param_register_int("eager_rdma_threshold", "Open rdma channel for eager messages after this number of messages received from peer (zero to disable)",
-            100, (int*)&mca_btl_mvapi_component.eager_rdma_threshold);
+            16, (int*)&mca_btl_mvapi_component.eager_rdma_threshold);
     mca_btl_mvapi_param_register_int("max_eager_rdma", "Maximum number of eager RDMA connections",
             16, (int*)&mca_btl_mvapi_component.max_eager_rdma);
     mca_btl_mvapi_param_register_int("eager_rdma_num", "Number of RDMA buffers for eager messages",

ompi/mca/btl/openib/btl_openib_component.c

@@ -187,11 +187,11 @@ int mca_btl_openib_component_open(void)
     mca_btl_openib_param_register_int("srq_sd_max", "Maximum number of send descriptors posted. (SRQ)",
                                       8,  &mca_btl_openib_component.srq_sd_max);
     mca_btl_openib_param_register_int("use_eager_rdma", "user RDMA for eager messages", 
-                                      0, (int*) &mca_btl_openib_component.use_eager_rdma);
+                                      1, (int*) &mca_btl_openib_component.use_eager_rdma);
     if (mca_btl_openib_component.use_srq)
         mca_btl_openib_component.use_eager_rdma = 0;
     mca_btl_openib_param_register_int("eager_rdma_threshold", "Open rdma channel for eager messages after this number of messages received from peer", 
-                                      100, (int*) &mca_btl_openib_component.eager_rdma_threshold);
+                                      16, (int*) &mca_btl_openib_component.eager_rdma_threshold);
     mca_btl_openib_param_register_int("max_eager_rdma", "Maximum number of eager RDMA connections",
                                       16, (int*)&mca_btl_openib_component.max_eager_rdma);
     mca_btl_openib_param_register_int("eager_rdma_num", "Number of RDMA buffers for eager messages",

ompi/mca/btl/self/btl_self.c

@@ -304,16 +304,7 @@ int mca_btl_self_send(
     mca_btl_base_tag_t tag)
 {
     /* upcall */
-    des->des_dst = des->des_src;
-    des->des_dst_cnt = des->des_src_cnt;
-    des->des_src = NULL;
-    des->des_src_cnt = 0;
     mca_btl_self_component.self_reg[tag].cbfunc(btl,tag,des,OMPI_SUCCESS);
-    des->des_src = des->des_dst;
-    des->des_src_cnt = des->des_dst_cnt;
-    des->des_dst = NULL;
-    des->des_dst_cnt = 0;
-
     /* send completion */
     des->des_cbfunc(btl,endpoint,des,OMPI_SUCCESS);
     return OMPI_SUCCESS;

ompi/mca/btl/self/btl_self_frag.c

@@ -7,8 +7,8 @@ static inline void mca_btl_self_frag_constructor(mca_btl_self_frag_t* frag)
     frag->segment.seg_len = frag->size;
     frag->base.des_src = &frag->segment;
     frag->base.des_src_cnt = 1;
-    frag->base.des_dst = NULL;
-    frag->base.des_dst_cnt = 0;
+    frag->base.des_dst = &frag->segment;
+    frag->base.des_dst_cnt = 1;
     frag->base.des_flags = 0;
 }