[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-74-gdc00384

[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  dc00384c4238486f01236ddb7ea69cd86428b096 (commit)
      from  9801de536d56164d4df5c9a61002247d51366667 (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 dc00384c4238486f01236ddb7ea69cd86428b096
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Mon Mar 30 16:21:17 2015 -0500

    bug fix in counter macros: forgot '+'

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

Summary of changes:
 darshan-runtime/darshan.h           |    4 ++--
 darshan-runtime/lib/darshan-posix.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Diff of changes:
diff --git a/darshan-runtime/darshan.h b/darshan-runtime/darshan.h
index 2849ff8..5a31115 100644
--- a/darshan-runtime/darshan.h
+++ b/darshan-runtime/darshan.h
@@ -75,11 +75,11 @@
 } while(0)
 
 #define DARSHAN_COUNTER_INC(__rec_p, __counter, __value) do{ \
-    (__rec_p)->counters[__counter] = __value; \
+    (__rec_p)->counters[__counter] += __value; \
 } while(0)
 
 #define DARSHAN_COUNTER_F_INC(__rec_p, __counter, __value) do{ \
-    (__rec_p)->fcounters[__counter] = __value; \
+    (__rec_p)->fcounters[__counter] += __value; \
 } while(0)
 
 #define DARSHAN_COUNTER_F_INC_NO_OVERLAP(__rec_p, __tm1, __tm2, __last, __counter) do{ \
diff --git a/darshan-runtime/lib/darshan-posix.c b/darshan-runtime/lib/darshan-posix.c
index 5a5fb66..24b68b4 100644
--- a/darshan-runtime/lib/darshan-posix.c
+++ b/darshan-runtime/lib/darshan-posix.c
@@ -601,7 +601,7 @@ static void posix_runtime_initialize()
     {
         .disable_instrumentation = &posix_disable_instrumentation,
         .prepare_for_reduction = &posix_prepare_for_reduction,
-        .record_reduction_op = NULL,//&posix_record_reduction_op,
+        .record_reduction_op = &posix_record_reduction_op,
         .get_output_data = &posix_get_output_data,
         .shutdown = &posix_shutdown
     };


hooks/post-receive
--