Merge pull request #3071 from yosefe/topic/fix-memhooks-mxm-hcoll

yalla/mtl_mxm/hcoll: open memory component to activate memory hooks.

ompi/mca/coll/hcoll/coll_hcoll.h

@@ -17,6 +17,7 @@
 #include "mpi.h"
 #include "ompi/mca/mca.h"
 #include "opal/memoryhooks/memory.h"
+#include "opal/mca/memory/base/base.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/coll/hcoll/coll_hcoll_component.c

@@ -217,6 +217,8 @@ static int hcoll_open(void)
 
     cm->libhcoll_initialized = false;
 
+    (void)mca_base_framework_open(&opal_memory_base_framework, 0);
+
     /* Register memory hooks */
     if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
         ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
@@ -259,5 +261,8 @@ static int hcoll_close(void)
         HCOL_VERBOSE(1,"Hcol library finalize failed");
         return OMPI_ERROR;
     }
+
+    mca_base_framework_close(&opal_memory_base_framework);
+
     return OMPI_SUCCESS;
 }

ompi/mca/mtl/mxm/mtl_mxm_component.c

@@ -17,6 +17,7 @@
 #include "opal/util/show_help.h"
 #include "ompi/proc/proc.h"
 #include "opal/memoryhooks/memory.h"
+#include "opal/mca/memory/base/base.h"
 #include "ompi/runtime/mpiruntime.h"
 
 #include "mtl_mxm.h"
@@ -201,6 +202,7 @@ static int ompi_mtl_mxm_component_open(void)
     }
 
 #if MXM_API >= MXM_VERSION(2,0)
+    (void)mca_base_framework_open(&opal_memory_base_framework, 0);
     /* Register memory hooks */
     if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
         ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
@@ -284,6 +286,7 @@ static int ompi_mtl_mxm_component_close(void)
 #if MXM_API >= MXM_VERSION(2,0)
         mxm_config_free_ep_opts(ompi_mtl_mxm.mxm_ep_opts);
         mxm_config_free_context_opts(ompi_mtl_mxm.mxm_ctx_opts);
+        mca_base_framework_close(&opal_memory_base_framework);
 #else
         mxm_config_free(ompi_mtl_mxm.mxm_ep_opts);
         mxm_config_free(ompi_mtl_mxm.mxm_ctx_opts);

ompi/mca/pml/yalla/pml_yalla.c

@@ -18,6 +18,7 @@
 
 #include "opal/runtime/opal.h"
 #include "opal/memoryhooks/memory.h"
+#include "opal/mca/memory/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 #include "ompi/message/message.h"
@@ -109,6 +110,8 @@ int mca_pml_yalla_open(void)
 
     PML_YALLA_VERBOSE(1, "%s", "mca_pml_yalla_open");
 
+    (void)mca_base_framework_open(&opal_memory_base_framework, 0);
+
     /* Set memory hooks */
     if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
         ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
@@ -153,6 +156,7 @@ int mca_pml_yalla_close(void)
         mxm_cleanup(ompi_pml_yalla.mxm_context);
         ompi_pml_yalla.mxm_context = NULL;
     }
+    mca_base_framework_close(&opal_memory_base_framework);
     return 0;
 }