prepare to delete mpool/rdma

This commit was SVN r26664.

ompi/mca/btl/ofud/btl_ofud.c

@@ -31,7 +31,6 @@
 #include "ompi/mca/btl/base/btl_base_error.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "ompi/mca/mpool/mpool.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
 
 #include "btl_ofud.h"
 #include "btl_ofud_frag.h"
@@ -544,7 +543,8 @@ int mca_btl_ud_module_init(mca_btl_ud_module_t *ud_btl)
                 ibv_get_device_name(ud_btl->ib_dev), strerror(errno)));
         return OMPI_ERROR;
     }
-        
+
+    mpool_resources.pool_name = "ofud";
     mpool_resources.reg_data = (void*)ud_btl;
     mpool_resources.sizeof_reg = sizeof(mca_btl_ud_reg_t);
     mpool_resources.register_mem = mca_btl_ud_reg_mr;

ompi/mca/btl/ofud/btl_ofud.h

@@ -39,7 +39,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/mpool/mpool.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 
 /* TODO - If I want this to go away, addr_t has to come over here */
 #include "btl_ofud_endpoint.h"

ompi/mca/btl/ofud/btl_ofud_component.c

@@ -39,7 +39,6 @@
 #include "opal/mca/base/mca_base_param.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 #include "ompi/runtime/mpiruntime.h"
 
@@ -131,7 +130,7 @@ static int mca_btl_ud_component_register(void)
                                 NULL, &mca_btl_ofud_component.if_exclude);
 
     mca_btl_ud_param_reg_string("mpool", "Name of the memory pool to be used",
-                                "rdma", &mca_btl_ofud_component.ud_mpool_name);
+                                "grdma", &mca_btl_ofud_component.ud_mpool_name);
 
     mca_btl_ud_param_reg_int("ib_pkey_index", "IB pkey index",
                              0, (int*)&mca_btl_ofud_component.ib_pkey_ix);

ompi/mca/btl/ofud/btl_ofud_frag.c

@@ -20,7 +20,6 @@
 
 #include "btl_ofud.h"
 #include "btl_ofud_frag.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
 
 
 static inline void mca_btl_ud_frag_common_constructor(mca_btl_ud_frag_t* frag)

ompi/mca/btl/ofud/btl_ofud_frag.h

@@ -25,8 +25,6 @@
 
 #include <infiniband/verbs.h>
 
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
-
 #include "btl_ofud.h"
 
 

ompi/mca/btl/openib/btl_openib.c

@@ -53,7 +53,7 @@
 #include "opal/datatype/opal_convertor.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "ompi/mca/mpool/mpool.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 #include "orte/util/proc_info.h"
 #include <errno.h>
 #include <string.h>

ompi/mca/btl/openib/btl_openib_component.c

@@ -80,9 +80,8 @@ const char *ibv_get_sysfs_path(void);
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/common/cuda/common_cuda.h"
 #include "ompi/mca/mpool/base/base.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/mpool/mpool.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 #include "ompi/runtime/mpiruntime.h"
 
@@ -1884,6 +1883,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
                        "eager RDMA and progress threads", true);
     }
 
+    mpool_resources.pool_name = "verbs";
     mpool_resources.reg_data = (void*)device;
     mpool_resources.sizeof_reg = sizeof(mca_btl_openib_reg_t);
     mpool_resources.register_mem = openib_reg_mr;

ompi/mca/btl/openib/btl_openib_mca.c

@@ -239,7 +239,7 @@ int btl_openib_register_mca_params(void)
                   REGINT_GE_ONE));
     CHECK(reg_string("mpool", NULL,
                      "Name of the memory pool to be used (it is unlikely that you will ever want to change this)",
-                     "rdma", &mca_btl_openib_component.ib_mpool_name,
+                     "grdma", &mca_btl_openib_component.ib_mpool_name,
                      0));
     CHECK(reg_int("reg_mru_len", NULL,
                   "Length of the registration cache most recently used list "

ompi/mca/btl/udapl/btl_udapl.c

@@ -35,7 +35,7 @@
 #include "btl_udapl_proc.h"
 #include "opal/datatype/opal_convertor.h" 
 #include "ompi/mca/mpool/base/base.h" 
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 #include "ompi/proc/proc.h"
 
@@ -352,6 +352,7 @@ mca_btl_udapl_init(DAT_NAME_PTR ia_name, mca_btl_udapl_module_t* btl)
     ((struct sockaddr_in*)&btl->udapl_addr.addr)->sin_port = htons(port);
 
     /* initialize the memory pool */
+    res.pool_name = "udapl";
     res.reg_data = btl;
     res.sizeof_reg = sizeof(mca_btl_udapl_reg_t);
     res.register_mem = udapl_reg_mr;

ompi/mca/btl/udapl/btl_udapl_component.c

@@ -31,7 +31,6 @@
 
 #include "opal/mca/base/mca_base_param.h"
 #include "ompi/mca/mpool/base/base.h" 
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
 #include "btl_udapl.h"
 #include "btl_udapl_frag.h"
 #include "btl_udapl_endpoint.h" 

ompi/mca/btl/udapl/btl_udapl_endpoint.c

@@ -34,7 +34,7 @@
 #include "opal/class/opal_pointer_array.h"
 
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 #include "ompi/mca/dpm/dpm.h"
 
 #include "ompi/mca/btl/base/btl_base_error.h"

ompi/mca/btl/udapl/btl_udapl_frag.c

@@ -20,8 +20,7 @@
  */
 
 #include "btl_udapl.h"
-#include "btl_udapl_frag.h" 
+#include "btl_udapl_frag.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
 
 
 static void mca_btl_udapl_frag_common_constructor(mca_btl_udapl_frag_t* frag) 

ompi/mca/btl/udapl/btl_udapl_mca.c

@@ -137,7 +137,7 @@ int mca_btl_udapl_register_mca_params(void)
 
     CHECK_PARAM_REGISTER_RETURN_VALUE(mca_btl_udapl_reg_string("mpool",
         "Name of the memory pool to be used.",
-        "rdma",
+        "grdma",
         &mca_btl_udapl_component.udapl_mpool_name,
         REGSTR_EMPTY_NOT_OK), tmp_rc, rc);
 

ompi/mca/btl/wv/btl_wv.c

@@ -44,8 +44,7 @@
 #include "btl_wv_endpoint.h"
 #include "opal/datatype/opal_convertor.h"
 #include "ompi/mca/mpool/base/base.h"
-#include "ompi/mca/mpool/mpool.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
 #include "orte/util/proc_info.h"
 #include <errno.h>
 #include <string.h>

ompi/mca/btl/wv/btl_wv_component.c

@@ -53,9 +53,8 @@
 #include "ompi/proc/proc.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/mpool/base/base.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/mpool/mpool.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 #include "ompi/runtime/mpiruntime.h"
 
@@ -1417,6 +1416,7 @@ static int init_one_device(opal_list_t *btl_list, struct wv_device* ib_dev)
         device->use_eager_rdma = values.use_eager_rdma;
     }
 
+    mpool_resources.pool_name = "$Sverbs";
     mpool_resources.reg_data = (void*)device;
     mpool_resources.sizeof_reg = sizeof(mca_btl_wv_reg_t);
     mpool_resources.register_mem = wv_reg_mr;

ompi/mca/btl/wv/btl_wv_mca.c

@@ -225,7 +225,7 @@ int btl_wv_register_mca_params(void)
                   REGINT_GE_ONE));
     CHECK(reg_string("mpool", NULL,
                      "Name of the memory pool to be used (it is unlikely that you will ever want to change this)",
-                     "rdma", &mca_btl_wv_component.ib_mpool_name,
+                     "grdma", &mca_btl_wv_component.ib_mpool_name,
                      0));
     CHECK(reg_int("reg_mru_len", NULL,
                   "Length of the registration cache most recently used list "