From 727f3096512051026294915b38b4e557b327e25d Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Sat, 20 Feb 2016 07:53:11 -0800
Subject: [PATCH] monitoring lib: rename to ompi_monitoring_prof.so

The library that is installed is specific to Open MPI, so put an
"ompi_" prefix on it.

Also do some minor line wrappings and cleanups of text.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
---
 test/monitoring/Makefile.am       | 23 +++++++++++++----------
 test/monitoring/monitoring_prof.c | 12 ++++++++++--
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/test/monitoring/Makefile.am b/test/monitoring/Makefile.am
index af2c022305c..ca4198300c7 100644
--- a/test/monitoring/Makefile.am
+++ b/test/monitoring/Makefile.am
@@ -5,6 +5,7 @@
 # Copyright (c) 2013-2015 Inria.  All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -18,16 +19,18 @@ if PROJECT_OMPI
     noinst_PROGRAMS = monitoring_test
     monitoring_test_SOURCES = monitoring_test.c
     monitoring_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
-    monitoring_test_LDADD = $(top_builddir)/ompi/libmpi.la $(top_builddir)/opal/libopen-pal.la
+    monitoring_test_LDADD = \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/opal/libopen-pal.la
 
 if MCA_BUILD_ompi_pml_monitoring_DSO
-    lib_LTLIBRARIES = monitoring_prof.la
-    monitoring_prof_la_SOURCES = monitoring_prof.c
-    monitoring_prof_la_LDFLAGS=-module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
-    monitoring_prof_la_LIBADD = $(top_builddir)/ompi/libmpi.la $(top_builddir)/opal/libopen-pal.la
-endif
+    lib_LTLIBRARIES = ompi_monitoring_prof.la
+    ompi_monitoring_prof_la_SOURCES = monitoring_prof.c
+    ompi_monitoring_prof_la_LDFLAGS= \
+        -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
+    ompi_monitoring_prof_la_LIBADD = \
+        $(top_builddir)/ompi/libmpi.la \
+        $(top_builddir)/opal/libopen-pal.la
+endif # MCA_BUILD_ompi_pml_monitoring_DSO
 
-endif
-
-distclean:
-	rm -rf *.dSYM .deps .libs *.la *.lo monitoring_test *.log *.o *.trs Makefile
+endif # PROJECT_OMPI
diff --git a/test/monitoring/monitoring_prof.c b/test/monitoring/monitoring_prof.c
index be9e0d8198d..26669f423c3 100644
--- a/test/monitoring/monitoring_prof.c
+++ b/test/monitoring/monitoring_prof.c
@@ -4,6 +4,7 @@
  *                         reserved.
  * Copyright (c) 2013-2015 Inria.  All rights reserved.
  * Copyright (c) 2013-2015 Bull SAS.  All rights reserved.
+ * Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -14,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
 
 ...
 ...