[Darshan-commits] [Git][darshan/darshan][master] fix bug in darshan-merge

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
5ff6955f by Shane Snyder at 2017-12-15T14:46:06-06:00
fix bug in darshan-merge

utility was trying to aggregate DXT records, which have no
record aggregation function

- - - - -


1 changed file:

- darshan-util/darshan-merge.c


Changes:

=====================================
darshan-util/darshan-merge.c
=====================================
--- a/darshan-util/darshan-merge.c
+++ b/darshan-util/darshan-merge.c
@@ -98,6 +98,10 @@ int build_mod_shared_rec_hash(char **infile_list, int n_infiles,
     int ret;
     int i;
 
+    /* if this module has no method for aggregating shared records, do nothing */
+    if(!(mod_logutils[mod_id]->log_agg_records))
+        return(0);
+
     /* loop over each input log file */
     for(i = 0; i < n_infiles; i++)
     {
@@ -233,6 +237,8 @@ int main(int argc, char *argv[])
             return(-1);
         }
 
+#if 0
+        /* XXX: the darshan_shutdown tag is never set in darshan-core, currently */
         /* if the input darshan log has metadata set indicating the darshan
          * shutdown procedure was called on the log, then we error out. if the
          * shutdown procedure was started, then it's possible the log has
@@ -246,6 +252,7 @@ int main(int argc, char *argv[])
             darshan_log_close(in_fd);
             return(-1);
         }
+#endif
 
         if(i == 0)
         {



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/5ff6955f5d03ea0fbd14a4f82c0a8d72ad42a1ec

---
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/5ff6955f5d03ea0fbd14a4f82c0a8d72ad42a1ec
You're receiving this email because of your account on xgitlab.cels.anl.gov.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20171215/a29cdd40/attachment.html>