[Darshan-commits] [Git][darshan/darshan][mmap-dev] bug fix in aggregating common accesses

[Shane Snyder]

Shane Snyder pushed to branch mmap-dev at darshan / darshan


Commits:
94430f41 by Shane Snyder at 2016-03-01T18:30:08-06:00
bug fix in aggregating common accesses

- - - - -


2 changed files:

- darshan-util/darshan-mpiio-logutils.c
- darshan-util/darshan-posix-logutils.c


Changes:

=====================================
darshan-util/darshan-mpiio-logutils.c
=====================================
--- a/darshan-util/darshan-mpiio-logutils.c
+++ b/darshan-util/darshan-mpiio-logutils.c
@@ -331,6 +331,7 @@ static void darshan_log_agg_mpiio_files(void *rec, void *agg_rec, int init_flag)
                     memset(tmp_val, 0, 4 * sizeof(int64_t));
                     memset(tmp_cnt, 0, 4 * sizeof(int64_t));
 
+                    if(mpi_rec->counters[j] == 0) break;
                     for(k = 0; k < 4; k++)
                     {
                         if(agg_mpi_rec->counters[i + k] == mpi_rec->counters[j])


=====================================
darshan-util/darshan-posix-logutils.c
=====================================
--- a/darshan-util/darshan-posix-logutils.c
+++ b/darshan-util/darshan-posix-logutils.c
@@ -326,7 +326,6 @@ static void darshan_log_agg_posix_files(void *rec, void *agg_rec, int init_flag)
             case POSIX_STRIDE1_STRIDE:
             case POSIX_ACCESS1_ACCESS:
                 /* increment common value counters */
-                if(psx_rec->counters[i] == 0) break;
 
                 /* first, collapse duplicates */
                 for(j = i; j < i + 4; j++)
@@ -348,6 +347,7 @@ static void darshan_log_agg_posix_files(void *rec, void *agg_rec, int init_flag)
                     memset(tmp_val, 0, 4 * sizeof(int64_t));
                     memset(tmp_cnt, 0, 4 * sizeof(int64_t));
 
+                    if(psx_rec->counters[j] == 0) break;
                     for(k = 0; k < 4; k++)
                     {
                         if(agg_psx_rec->counters[i + k] == psx_rec->counters[j])



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/94430f41b6f479bf73c4350a26378a1b04c1db0e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20160301/f14596f9/attachment.html>