btl/uct: module md_name to mca_btl_uct_md_t

More cleanup preparing to separate connection-only tls from their module.

Signed-off-by: Nathan Hjelm <[email protected]>

Author: hjelmn

opal/mca/btl/uct/btl_uct.h

@@ -98,9 +98,6 @@ struct mca_btl_uct_module_t {
     /** registration cache */
     mca_rcache_base_module_t *rcache;
 
-    /** name of the memory domain backing this module */
-    char *md_name;
-
     /** am and rdma share endpoints */
     bool shared_endpoints;
 

opal/mca/btl/uct/btl_uct_component.c

@@ -258,7 +258,7 @@ static size_t mca_btl_uct_tl_modex_size(mca_btl_uct_tl_t *tl)
 
 static size_t mca_btl_uct_module_modex_size(mca_btl_uct_module_t *module)
 {
-    size_t modex_size = 4 + strlen(module->md_name) + 1;
+    size_t modex_size = 4 + strlen(module->md->md_name) + 1;
 
     if (module->rdma_tl) {
         modex_size += mca_btl_uct_tl_modex_size(module->rdma_tl);
@@ -307,14 +307,14 @@ static size_t mca_btl_uct_tl_modex_pack(mca_btl_uct_module_t *module, mca_btl_uc
 
 static uint8_t *mca_btl_uct_modex_pack(mca_btl_uct_module_t *module, uint8_t *modex_data)
 {
-    size_t name_len = strlen(module->md_name);
+    size_t name_len = strlen(module->md->md_name);
 
     /* pack the size */
     *((uint32_t *) modex_data) = (uint32_t) mca_btl_uct_module_modex_size(module);
 
     modex_data += 4;
 
-    strcpy((char *) modex_data, module->md_name);
+    strcpy((char *) modex_data, module->md->md_name);
     modex_data += name_len + 1;
 
     if (module->rdma_tl) {
@@ -366,7 +366,7 @@ static int mca_btl_uct_modex_send(void)
     return rc;
 }
 
-static mca_btl_uct_module_t *mca_btl_uct_alloc_module(const char *md_name, mca_btl_uct_md_t *md,
+static mca_btl_uct_module_t *mca_btl_uct_alloc_module(mca_btl_uct_md_t *md,
                                                       size_t registration_size)
 {
     mca_btl_uct_module_t *module;
@@ -389,7 +389,6 @@ static mca_btl_uct_module_t *mca_btl_uct_alloc_module(const char *md_name, mca_b
     OBJ_CONSTRUCT(&module->lock, opal_recursive_mutex_t);
 
     module->md = md;
-    module->md_name = strdup(md_name);
     module->super.btl_registration_handle_size = registration_size;
 
     return module;
@@ -463,25 +462,26 @@ static int mca_btl_uct_component_process_uct_md(uct_md_resource_desc_t *md_desc)
     }
 
     md = OBJ_NEW(mca_btl_uct_md_t);
+    md->md_name = strdup(md_desc->md_name);
 
 #if UCT_API >= UCT_VERSION(1, 7)
     ucs_status = uct_md_config_read(component, NULL, NULL, &uct_config);
     if (UCS_OK != ucs_status) {
         BTL_VERBOSE(("uct_md_config_read failed %d (%s)", ucs_status, ucs_status_string(ucs_status)));
         return OPAL_ERR_NOT_AVAILABLE;
     }
-    ucs_status = uct_md_open(component, md_desc->md_name, uct_config, &md->uct_md);
+    ucs_status = uct_md_open(component, md->md_name, uct_config, &md->uct_md);
     if (UCS_OK != ucs_status) {
         BTL_VERBOSE(("uct_md_open failed %d (%s)", ucs_status, ucs_status_string(ucs_status)));
         return OPAL_ERR_NOT_AVAILABLE;
     }
 #else
-    ucs_status = uct_md_config_read(md_desc->md_name, NULL, NULL, &uct_config);
+    ucs_status = uct_md_config_read(md->md_name, NULL, NULL, &uct_config);
     if (UCS_OK != ucs_status) {
         BTL_VERBOSE(("uct_md_config_read failed %d (%s)", ucs_status, ucs_status_string(ucs_status)));
         return OPAL_ERR_NOT_AVAILABLE;
     }
-    ucs_status = uct_md_open(md_desc->md_name, uct_config, &md->uct_md);
+    ucs_status = uct_md_open(md->md_name, uct_config, &md->uct_md);
     if (UCS_OK != ucs_status) {
         BTL_VERBOSE(("uct_md_open failed %d (%s)", ucs_status, ucs_status_string(ucs_status)));
         return OPAL_ERR_NOT_AVAILABLE;
@@ -500,7 +500,7 @@ static int mca_btl_uct_component_process_uct_md(uct_md_resource_desc_t *md_desc)
         return OPAL_ERR_NOT_AVAILABLE;
     }
 
-    module = mca_btl_uct_alloc_module(md_desc->md_name, md, md_attr.rkey_packed_size);
+    module = mca_btl_uct_alloc_module(md, md_attr.rkey_packed_size);
     if (NULL == module) {
         uct_release_tl_resource_list(tl_desc);
         return OPAL_ERR_OUT_OF_RESOURCE;
@@ -517,7 +517,7 @@ static int mca_btl_uct_component_process_uct_md(uct_md_resource_desc_t *md_desc)
     OBJ_RELEASE(md);
 
     if (NULL == module->am_tl && NULL == module->rdma_tl && (NULL == module->conn_tl || !consider_for_connection_module)) {
-        BTL_VERBOSE(("uct memory domain %s does not have any appropriate tls", md_desc->md_name));
+        BTL_VERBOSE(("uct memory domain %s does not have any appropriate tls", md->md_name));
         mca_btl_uct_finalize(&module->super);
         return OPAL_ERR_NOT_AVAILABLE;
     }
@@ -534,7 +534,7 @@ static int mca_btl_uct_component_process_uct_md(uct_md_resource_desc_t *md_desc)
         /* NTH: a registration cache shouldn't be necessary when using UCT but there are measurable
          * performance benefits to using rcache/grdma instead of assuming UCT will do the right
          * thing. */
-        (void) opal_asprintf(&tmp, "uct.%s", module->md_name);
+        (void) opal_asprintf(&tmp, "uct.%s", md->md_name);
 
         rcache_resources.cache_name = tmp;
         rcache_resources.reg_data = (void *) module;
@@ -553,7 +553,7 @@ static int mca_btl_uct_component_process_uct_md(uct_md_resource_desc_t *md_desc)
         }
     } else {
         if (NULL == mca_btl_uct_component.conn_module) {
-            BTL_VERBOSE(("memory domain %s may be used for connections", md_desc->md_name));
+            BTL_VERBOSE(("memory domain %s may be used for connections", md->md_name));
             mca_btl_uct_component.conn_module = module;
         } else {
             mca_btl_uct_finalize(&module->super);
@@ -635,7 +635,7 @@ static void mca_btl_uct_component_validate_modules(void) {
                 && NULL == module->conn_tl) {
                 /* module can not be used */
                 BTL_VERBOSE(("module for memory domain %s can not be used due to missing connection transport",
-                             module->md_name));
+                             module->md->md_name));
                 mca_btl_uct_finalize (&mca_btl_uct_component.modules[i]->super);
                 mca_btl_uct_component.modules[i] = NULL;
             }

opal/mca/btl/uct/btl_uct_endpoint.c

@@ -410,11 +410,11 @@ static int mca_btl_uct_find_modex(mca_btl_uct_module_t *uct_btl, mca_btl_uct_mod
     for (int i = 0; i < modex->module_count; ++i) {
         uint32_t modex_size = *((uint32_t *) modex_data);
 
-        BTL_VERBOSE(("found modex for md %s, searching for %s", modex_data + 4, uct_btl->md_name));
+        BTL_VERBOSE(("found modex for md %s, searching for %s", modex_data + 4, uct_btl->md->md_name));
 
         modex_data += 4;
 
-        if (0 != strcmp((char *) modex_data, uct_btl->md_name)) {
+        if (0 != strcmp((char *) modex_data, uct_btl->md->md_name)) {
             /* modex belongs to a different module, skip it and continue */
             modex_data += modex_size - 4;
             continue;
@@ -427,12 +427,12 @@ static int mca_btl_uct_find_modex(mca_btl_uct_module_t *uct_btl, mca_btl_uct_mod
             *remote_module_index = i;
         }
 
-        BTL_VERBOSE(("finished processing modex for %s", uct_btl->md_name));
+        BTL_VERBOSE(("finished processing modex for %s", uct_btl->md->md_name));
 
         return OPAL_SUCCESS;
     }
 
-    BTL_ERROR(("could not find modex for %s", uct_btl->md_name));
+    BTL_ERROR(("could not find modex for %s", uct_btl->md->md_name));
 
     return OPAL_ERR_NOT_FOUND;
 }

opal/mca/btl/uct/btl_uct_module.c

@@ -303,7 +303,6 @@ int mca_btl_uct_finalize(mca_btl_base_module_t *btl)
 
     OBJ_DESTRUCT(&uct_module->endpoint_lock);
 
-    free(uct_module->md_name);
     free(uct_module);
 
     return OPAL_SUCCESS;
@@ -357,10 +356,12 @@ OBJ_CLASS_INSTANCE(mca_btl_uct_reg_t, opal_free_list_item_t, NULL, NULL);
 static void mca_btl_uct_md_construct(mca_btl_uct_md_t *md)
 {
     md->uct_md = NULL;
+    md->md_name = NULL;
 }
 
 static void mca_btl_uct_md_destruct(mca_btl_uct_md_t *md)
 {
+    free(md->md_name);
     if (md->uct_md) {
         uct_md_close(md->uct_md);
         md->uct_md = NULL;

opal/mca/btl/uct/btl_uct_tl.c

@@ -457,7 +457,7 @@ static mca_btl_uct_tl_t *mca_btl_uct_create_tl(mca_btl_uct_module_t *module, mca
         return NULL;
     }
 
-    BTL_VERBOSE(("Interface CAPS for tl %s::%s: 0x%lx", module->md_name, tl_desc->tl_name,
+    BTL_VERBOSE(("Interface CAPS for tl %s::%s: 0x%lx", module->md->md_name, tl_desc->tl_name,
                  (unsigned long) tl->uct_iface_attr.cap.flags));
 
     return tl;

opal/mca/btl/uct/btl_uct_types.h

@@ -67,6 +67,9 @@ struct mca_btl_uct_md_t {
     /** make this an opal object */
     opal_object_t super;
 
+    /** name of the memory domain backing this module */
+    char *md_name;
+
     /** UCT memory domain handle */
     uct_md_h uct_md;
 };