[Darshan-commits] [Darshan] branch, master, updated. darshan-2.3.1-pre2-8-g20d809d

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, master has been updated
       via  20d809d31228bc1c6e04301874ff84d384285022 (commit)
      from  b589247c3831c15164c4a96b1033936390baf4db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 20d809d31228bc1c6e04301874ff84d384285022
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Fri Mar 13 14:59:39 2015 +0000

    experimenting with cxx profile conf on mira

-----------------------------------------------------------------------

Summary of changes:
 .../share/mpi-profile/darshan-bg-cxx.conf.in       |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Diff of changes:
diff --git a/darshan-runtime/share/mpi-profile/darshan-bg-cxx.conf.in b/darshan-runtime/share/mpi-profile/darshan-bg-cxx.conf.in
index ac56b48..2e3b9a4 100644
--- a/darshan-runtime/share/mpi-profile/darshan-bg-cxx.conf.in
+++ b/darshan-runtime/share/mpi-profile/darshan-bg-cxx.conf.in
@@ -13,16 +13,16 @@ dyncheck2=$?
 echo "${allargs[@]}" | grep "\\-dynamic" >& /dev/null
 dyncheck3=$?
 
-# try to detect name of libmpichcxx library needed for pmpi
-#   - these may be named with different suffixes to match the compiler version
-D_MPI_PRELIB=`echo $LIBS |grep "\-lmpichcxx\-\\S\+" -o`
-
 # Skip profiling if we know that dynamic linking is in use.  See LD_PRELOAD 
 # method instead.
 if [ "$dyncheck1" -ne 0 -a "$dyncheck2" -ne 0 -a "$dyncheck3" -ne 0 ]; then
 
+	# NOTE: there is something fragile here.  We are relying on the BG mpicxx script to set a 
+        #       variable called $cxxlibs to the name of the libmpichcxx variant that we need in order
+        #       to intercept pmpi calls
+
 	# Libraries (and paths) to include before the MPI library 
-	export PROFILE_PRELIB="$D_MPI_PRELIB `$DARSHAN_PREFIX/bin/darshan-config --pre-ld-flags`"
+	export PROFILE_PRELIB="$cxxlibs `$DARSHAN_PREFIX/bin/darshan-config --pre-ld-flags`"
 
 	# Libraries to include after the MPI library 
 	export PROFILE_POSTLIB=`$DARSHAN_PREFIX/bin/darshan-config --post-ld-flags`


hooks/post-receive
--