[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-51-g657e1b1

[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, dev-modular has been updated
       via  657e1b1a816abdb4ca7e2226a7c2573533ce0040 (commit)
      from  b2b9fcbef8fd7a0475eef712d0e96aac50d2c4c3 (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 657e1b1a816abdb4ca7e2226a7c2573533ce0040
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Tue Mar 17 22:35:36 2015 -0500

    bug fix and makefile cleanup

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

Summary of changes:
 darshan-runtime/darshan-config.in    |    2 +-
 darshan-runtime/darshan-gen-cc.pl.in |    3 ++-
 darshan-runtime/lib/darshan-core.c   |    2 +-
 darshan-util/Makefile.in             |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


Diff of changes:
diff --git a/darshan-runtime/darshan-config.in b/darshan-runtime/darshan-config.in
index c000993..a0d0af0 100755
--- a/darshan-runtime/darshan-config.in
+++ b/darshan-runtime/darshan-config.in
@@ -13,7 +13,7 @@ DARSHAN_LD_FLAGS="@LDFLAGS@"
 
 # TODO: extra -lmpi in POST_LD_FLAGS -- link ordering issue
 PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan -lz $CP_WRAPPERS"
-POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan -lmpi -lz -lrt -lpthread"
+POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan -lz -lrt -lpthread"
 
 usage="\
 Usage: darshan-config [--pre-ld-flags] [--post-ld-flags]"
diff --git a/darshan-runtime/darshan-gen-cc.pl.in b/darshan-runtime/darshan-gen-cc.pl.in
index 0a720b8..afc514c 100644
--- a/darshan-runtime/darshan-gen-cc.pl.in
+++ b/darshan-runtime/darshan-gen-cc.pl.in
@@ -208,6 +208,7 @@ print OUTPUT<<"EOF";
 
     # if allargs includes any libraries, then we need to get 
     # -ldarshan-mpi-io in there first
+    # TODO: changing -ldarshan-mpi-io to -ldarshan OK ?
     argno=0;
     once=0;
     compiler_check=0;
@@ -215,7 +216,7 @@ print OUTPUT<<"EOF";
     for arg in "\$\{newallargs\[\@\]\}"; do
         res=`expr match "\$arg" "-l"`;
         if [ \$res -gt 0 -a \$once -lt 1 ]; then
-            newallargs[\$argno]=-ldarshan-mpi-io
+            newallargs[\$argno]=-ldarshan
             argno=`expr \$argno + 1`
             newallargs[\$argno]=\$arg;
             once=1;
diff --git a/darshan-runtime/lib/darshan-core.c b/darshan-runtime/lib/darshan-core.c
index 95d649f..ac1d94a 100644
--- a/darshan-runtime/lib/darshan-core.c
+++ b/darshan-runtime/lib/darshan-core.c
@@ -472,7 +472,7 @@ static void darshan_core_shutdown()
         if(internal_timing_flag)
             mod1[i] = DARSHAN_MPI_CALL(PMPI_Wtime)();   
         /* if all processes used this module, prepare to do a shared file reduction */
-        if(global_mod_use_count[j] == nprocs)
+        if(global_mod_use_count[i] == nprocs)
         {
             int shared_rec_count = 0;
             int rec_sz = 0;
diff --git a/darshan-util/Makefile.in b/darshan-util/Makefile.in
index ff6cf92..60f3436 100644
--- a/darshan-util/Makefile.in
+++ b/darshan-util/Makefile.in
@@ -96,7 +96,7 @@ install:: all
 	install -d $(includedir)
 	install -d $(pkgconfigdir)
 #	install -m 755 darshan-parser $(bindir)
-#	install -m 755 darshan-posix-parser $(bindir)
+	install -m 755 darshan-posix-parser $(bindir)
 #	install -m 755 darshan-convert $(bindir)
 #	install -m 755 darshan-diff $(bindir)
 #	install -m 755 darshan-analyzer $(bindir)


hooks/post-receive
--