[Darshan-commits] [Git][darshan/darshan][master] 2 commits: easy bug fix in darshan-diff tool

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
6a53c79f by Shane Snyder at 2017-02-23T11:10:12-06:00
easy bug fix in darshan-diff tool

- - - - -
e9bd9496 by Shane Snyder at 2017-02-23T11:19:00-06:00
do not provide diff of DXT module data

- - - - -


1 changed file:

- darshan-util/darshan-diff.c


Changes:

=====================================
darshan-util/darshan-diff.c
=====================================
--- a/darshan-util/darshan-diff.c
+++ b/darshan-util/darshan-diff.c
@@ -191,6 +191,10 @@ int main(int argc, char *argv[])
 
         for(i = 0; i < DARSHAN_MAX_MODS; i++)
         {
+            /* skip the DXT modules -- we won't be diff'ing traces */
+            if(i == DXT_POSIX_MOD || i == DXT_MPIIO_MOD)
+                continue;
+
             /* TODO: skip modules that don't have the same format version, for now */
             if(rec_ref1->mod_recs[i] && rec_ref2 && rec_ref2->mod_recs[i] &&
                 (file1->mod_ver[i] != file2->mod_ver[i]))
@@ -371,7 +375,7 @@ static int darshan_build_global_record_hash(
      */
     for(i = 0; i < DARSHAN_MAX_MODS; i++)
     {
-        if(!mod_logutils[i]) break;
+        if(!mod_logutils[i]) continue;
 
         while(1)
         {



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/d2f2053e8356e9bf62866262eb454162e20f1696...e9bd9496d81f67767f53aeecd1a147939f932a4a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20170223/bd572b2f/attachment.html>