btl/uct: move uct_component from the module to mca_uct_md_t

Author: hjelmn

opal/mca/btl/uct/btl_uct.h

@@ -91,10 +91,6 @@ struct mca_btl_uct_module_t {
     /** array containing the am_tl and rdma_tl */
     mca_btl_uct_tl_t *comm_tls[2];
 
-#if UCT_API >= UCT_VERSION(1, 7)
-    uct_component_h uct_component;
-#endif
-
     /** registration cache */
     mca_rcache_base_module_t *rcache;
 

opal/mca/btl/uct/btl_uct_component.c

@@ -471,6 +471,9 @@ 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)
+    md->uct_component = component;
+#endif
 
 #if UCT_API >= UCT_VERSION(1, 7)
     ucs_status = uct_md_config_read(component, NULL, NULL, &uct_config);
@@ -528,10 +531,6 @@ static int mca_btl_uct_component_process_uct_md(uct_md_resource_desc_t *md_desc)
         return OPAL_ERR_NOT_AVAILABLE;
     }
 
-#if UCT_API >= UCT_VERSION(1, 7)
-    module->uct_component = component;
-#endif
-
     if (!consider_for_connection_module) {
         module->module_index = mca_btl_uct_component.module_count;
 

opal/mca/btl/uct/btl_uct_module.c

@@ -344,6 +344,7 @@ 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_component = NULL;
     md->uct_md = NULL;
     md->md_name = NULL;
     OBJ_CONSTRUCT(&md->tls, opal_list_t);

opal/mca/btl/uct/btl_uct_rdma.h

@@ -53,7 +53,7 @@ static inline int mca_btl_uct_get_rkey(mca_btl_uct_module_t *module,
     }
 
 #    if UCT_API >= UCT_VERSION(1, 7)
-    ucs_status = uct_rkey_unpack(module->uct_component, (void *) remote_handle, rkey);
+    ucs_status = uct_rkey_unpack(module->md->uct_component, (void *) remote_handle, rkey);
 #    else
     ucs_status = uct_rkey_unpack((void *) remote_handle, rkey);
 #    endif
@@ -63,7 +63,7 @@ static inline int mca_btl_uct_get_rkey(mca_btl_uct_module_t *module,
 static inline void mca_btl_uct_rkey_release(mca_btl_uct_module_t *uct_btl, uct_rkey_bundle_t *rkey)
 {
 #    if UCT_API >= UCT_VERSION(1, 7)
-    uct_rkey_release(uct_btl->uct_component, rkey);
+    uct_rkey_release(uct_btl->md->uct_component, rkey);
 #    else
     (void) uct_btl;
     uct_rkey_release(rkey);

opal/mca/btl/uct/btl_uct_types.h

@@ -75,6 +75,10 @@ struct mca_btl_uct_md_t {
 
     /** UCT memory domain handle */
     uct_md_h uct_md;
+
+#if UCT_API >= UCT_VERSION(1, 7)
+    uct_component_h uct_component;
+#endif
 };
 
 typedef struct mca_btl_uct_md_t mca_btl_uct_md_t;