Merge pull request #1390 from jsquyres/pr/minor-monitoring-library-cleanups

monitoring lib: rename to ompi_monitoring_prof.so

test/monitoring/Makefile.am

@@ -6,6 +6,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -18,17 +19,19 @@
 if PROJECT_OMPI
     noinst_PROGRAMS = monitoring_test
     monitoring_test_SOURCES = monitoring_test.c
-    monitoring_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+    monitoring_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
-    monitoring_test_LDADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la $(top_builddir)/opal/libopen-pal.la
+    monitoring_test_LDADD = \
+        $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 if MCA_BUILD_ompi_pml_monitoring_DSO
-    lib_LTLIBRARIES = monitoring_prof.la
+    lib_LTLIBRARIES = ompi_monitoring_prof.la
-    monitoring_prof_la_SOURCES = monitoring_prof.c
+    ompi_monitoring_prof_la_SOURCES = monitoring_prof.c
-    monitoring_prof_la_LDFLAGS=-module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
+    ompi_monitoring_prof_la_LDFLAGS= \
-    monitoring_prof_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la $(top_builddir)/opal/libopen-pal.la
+        -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
-endif
+    ompi_monitoring_prof_la_LIBADD = \
+        $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+endif # MCA_BUILD_ompi_pml_monitoring_DSO
 
-endif
+endif # PROJECT_OMPI
-
-distclean:
-	rm -rf *.dSYM .deps .libs *.la *.lo monitoring_test *.log *.o *.trs Makefile

test/monitoring/monitoring_prof.c

@@ -15,12 +15,19 @@
 /*
 pml monitoring PMPI profiler
 
-Designed by George Bosilca <bosilca@icl.utk.edu>, Emmanuel Jeannot <emmanuel.jeannot@inria.fr> and Guillaume Papauré <guillaume.papaure@bull.net>
+Designed by:
+  George Bosilca <bosilca@icl.utk.edu>
+  Emmanuel Jeannot <emmanuel.jeannot@inria.fr>
+  Guillaume Papauré <guillaume.papaure@bull.net>
+
 Contact the authors for questions.
 
 To be run as:
 
-mpirun -np 4 -x LD_PRELOAD=ompi_install_dir/lib/monitoring_prof.so --mca pml_monitoring_enable 1 ./my_app
+mpirun -np 4 \
+    --mca pml_monitoring_enable 1 \
+    -x LD_PRELOAD=ompi_install_dir/lib/ompi_monitoring_prof.so \
+    ./my_app
 
 ...
 ...