Merge pull request #6675 from hoopoepg/topic/ucx-common-init-patcher-on-hooks-used-only

COMMON/UCX: init memhooks infra on external hooks only

opal/mca/common/ucx/common_ucx.c

@@ -91,23 +91,23 @@ OPAL_DECLSPEC void opal_common_ucx_mca_register(void)
     opal_common_ucx.output = opal_output_open(NULL);
     opal_output_set_verbosity(opal_common_ucx.output, opal_common_ucx.verbose);
 
-    ret = mca_base_framework_open(&opal_memory_base_framework, 0);
-    if (OPAL_SUCCESS != ret) {
-        /* failed to initialize memory framework - just exit */
-        MCA_COMMON_UCX_VERBOSE(1, "failed to initialize memory base framework: %d, "
-                                  "memory hooks will not be used", ret);
-        return;
-    }
-
     /* Set memory hooks */
-    if (opal_common_ucx.opal_mem_hooks &&
-        (OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
-        ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
-         opal_mem_hooks_support_level()))
-    {
-        MCA_COMMON_UCX_VERBOSE(1, "%s", "using OPAL memory hooks as external events");
-        ucm_set_external_event(UCM_EVENT_VM_UNMAPPED);
-        opal_mem_hooks_register_release(opal_common_ucx_mem_release_cb, NULL);
+    if (opal_common_ucx.opal_mem_hooks) {
+        ret = mca_base_framework_open(&opal_memory_base_framework, 0);
+        if (OPAL_SUCCESS != ret) {
+            /* failed to initialize memory framework - just exit */
+            MCA_COMMON_UCX_VERBOSE(1, "failed to initialize memory base framework: %d, "
+                                      "memory hooks will not be used", ret);
+            return;
+        }
+
+        if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
+            ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
+             opal_mem_hooks_support_level())) {
+            MCA_COMMON_UCX_VERBOSE(1, "%s", "using OPAL memory hooks as external events");
+            ucm_set_external_event(UCM_EVENT_VM_UNMAPPED);
+            opal_mem_hooks_register_release(opal_common_ucx_mem_release_cb, NULL);
+        }
     }
 }
 
@@ -194,7 +194,6 @@ OPAL_DECLSPEC int opal_common_ucx_del_procs_nofence(opal_common_ucx_del_proc_t *
     void *dreq, **dreqs;
     size_t i;
     size_t n;
-    int ret = OPAL_SUCCESS;
 
     MCA_COMMON_UCX_ASSERT(procs || !count);
     MCA_COMMON_UCX_ASSERT(max_disconnect > 0);