Topic/monitoring

configure.ac

@@ -1409,6 +1409,10 @@ AC_CONFIG_FILES([
     test/util/Makefile
 ])
 m4_ifdef([project_ompi], [AC_CONFIG_FILES([test/monitoring/Makefile])])
+m4_ifdef([project_ompi], [
+          m4_ifdef([MCA_BUILD_ompi_pml_monitoring_DSO_TRUE],
+                   [AC_CONFIG_LINKS(test/monitoring/profile2mat.pl:test/monitoring/profile2mat.pl
+                                    test/monitoring/aggregate_profile.pl:test/monitoring/aggregate_profile.pl)])])
 
 AC_CONFIG_FILES([contrib/dist/mofed/debian/rules],
                 [chmod +x contrib/dist/mofed/debian/rules])

ompi/mca/coll/base/coll_base_find_available.c

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2017 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -46,9 +46,6 @@
 static int init_query(const mca_base_component_t * ls,
                       bool enable_progress_threads,
                       bool enable_mpi_threads);
-static int init_query_2_0_0(const mca_base_component_t * ls,
-                            bool enable_progress_threads,
-                            bool enable_mpi_threads);
 
 /*
  * Scan down the list of successfully opened components and query each of
@@ -105,6 +102,20 @@ int mca_coll_base_find_available(bool enable_progress_threads,
 }
 
 
+/*
+ * Query a specific component, coll v2.0.0
+ */
+static inline int
+init_query_2_0_0(const mca_base_component_t * component,
+                 bool enable_progress_threads,
+                 bool enable_mpi_threads)
+{
+    mca_coll_base_component_2_0_0_t *coll =
+        (mca_coll_base_component_2_0_0_t *) component;
+
+    return coll->collm_init_query(enable_progress_threads,
+                                  enable_mpi_threads);
+}
 /*
  * Query a component, see if it wants to run at all.  If it does, save
  * some information.  If it doesn't, close it.
@@ -138,33 +149,11 @@ static int init_query(const mca_base_component_t * component,
     }
 
     /* Query done -- look at the return value to see what happened */
-
-    if (OMPI_SUCCESS != ret) {
-        opal_output_verbose(10, ompi_coll_base_framework.framework_output,
-                            "coll:find_available: coll component %s is not available",
-                            component->mca_component_name);
-    } else {
-        opal_output_verbose(10, ompi_coll_base_framework.framework_output,
-                            "coll:find_available: coll component %s is available",
-                            component->mca_component_name);
-    }
-
-    /* All done */
+    opal_output_verbose(10, ompi_coll_base_framework.framework_output,
+                        "coll:find_available: coll component %s is %savailable",
+                        component->mca_component_name,
+                        (OMPI_SUCCESS == ret) ? "": "not ");
 
     return ret;
 }
 
-
-/*
- * Query a specific component, coll v2.0.0
- */
-static int init_query_2_0_0(const mca_base_component_t * component,
-                            bool enable_progress_threads,
-                            bool enable_mpi_threads)
-{
-    mca_coll_base_component_2_0_0_t *coll =
-        (mca_coll_base_component_2_0_0_t *) component;
-
-    return coll->collm_init_query(enable_progress_threads,
-                                  enable_mpi_threads);
-}

ompi/mca/coll/monitoring/Makefile.am

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2016 Inria.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+monitoring_sources  = \
+	coll_monitoring.h            \
+	coll_monitoring_allgather.c  \
+	coll_monitoring_allgatherv.c \
+	coll_monitoring_allreduce.c  \
+	coll_monitoring_alltoall.c   \
+	coll_monitoring_alltoallv.c  \
+	coll_monitoring_alltoallw.c  \
+	coll_monitoring_barrier.c    \
+	coll_monitoring_bcast.c      \
+	coll_monitoring_component.c  \
+	coll_monitoring_exscan.c     \
+	coll_monitoring_gather.c     \
+	coll_monitoring_gatherv.c    \
+	coll_monitoring_neighbor_allgather.c  \
+	coll_monitoring_neighbor_allgatherv.c \
+	coll_monitoring_neighbor_alltoall.c   \
+	coll_monitoring_neighbor_alltoallv.c  \
+	coll_monitoring_neighbor_alltoallw.c  \
+	coll_monitoring_reduce.c     \
+	coll_monitoring_reduce_scatter.c \
+	coll_monitoring_reduce_scatter_block.c \
+	coll_monitoring_scan.c       \
+	coll_monitoring_scatter.c    \
+	coll_monitoring_scatterv.c
+
+if MCA_BUILD_ompi_coll_monitoring_DSO
+component_noinst =
+component_install = mca_coll_monitoring.la
+else
+component_noinst = libmca_coll_monitoring.la
+component_install =
+endif
+
+mcacomponentdir = $(ompilibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_coll_monitoring_la_SOURCES = $(monitoring_sources)
+mca_coll_monitoring_la_LDFLAGS = -module -avoid-version
+mca_coll_monitoring_la_LIBADD = \
+	$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
+
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_coll_monitoring_la_SOURCES = $(monitoring_sources)
+libmca_coll_monitoring_la_LDFLAGS = -module -avoid-version