diff --git a/darshan-util/darshan-dxt-parser.c b/darshan-util/darshan-dxt-parser.c index 6e16cc0f2a629a38f17d359f8d250d278ed8770b..01c65929dd5be37fbef28395cb2fe27d10d13e2a 100644 --- a/darshan-util/darshan-dxt-parser.c +++ b/darshan-util/darshan-dxt-parser.c @@ -53,7 +53,6 @@ int main(int argc, char **argv) char buffer[DARSHAN_JOB_METADATA_LEN]; struct lustre_record_ref *lustre_rec_ref, *tmp_lustre_rec_ref; struct lustre_record_ref *lustre_rec_hash = NULL; - int empty_mods = 0; char *mod_buf = NULL; if (argc != 2) @@ -189,10 +188,7 @@ int main(int argc, char **argv) /* check each module for any data */ if (fd->mod_map[i].len == 0) - { - empty_mods++; continue; - } /* skip modules with no logutil definitions */ else if (!mod_logutils[i]) { @@ -209,6 +205,8 @@ int main(int argc, char **argv) printf("# %s module data\n", darshan_module_names[i]); printf("# ***************************************************\n"); } + else if (i != DARSHAN_LUSTRE_MOD) + continue; /* loop over each of this module's records and print them */ while(1) @@ -224,6 +222,9 @@ int main(int argc, char **argv) ret = mod_logutils[i]->log_get_record(fd, (void **)&(lustre_rec_ref->rec)); + + HASH_ADD(hlink, lustre_rec_hash, rec->base_rec.id, + sizeof(darshan_record_id), lustre_rec_ref); } else { ret = mod_logutils[i]->log_get_record(fd, (void **)&mod_buf); } @@ -239,14 +240,6 @@ int main(int argc, char **argv) break; } - if (i == DARSHAN_LUSTRE_MOD) { - HASH_ADD(hlink, lustre_rec_hash, rec->base_rec.id, - sizeof(darshan_record_id), lustre_rec_ref); - } - - if ((i != DXT_POSIX_MOD) && (i != DXT_MPIIO_MOD)) - continue; - base_rec = (struct darshan_base_record *)mod_buf; /* get the pathname for this record */ @@ -292,8 +285,6 @@ int main(int argc, char **argv) } } - if (empty_mods == DARSHAN_MAX_MODS) - printf("\n# no module data available.\n"); ret = 0; /* DXT */ diff --git a/darshan-util/darshan-logutils.h b/darshan-util/darshan-logutils.h index f3cbd490ffa5e5a8fefc24e87ede122ffb0bd7b4..e7ee7854e7e80df3b019c163f0c6ebaa73e53bde 100644 --- a/darshan-util/darshan-logutils.h +++ b/darshan-util/darshan-logutils.h @@ -20,7 +20,7 @@ /* Maximum size of a record - Lustre OST lists can get huge, but 81920 is enough * for 10K OSTs */ -#define DEF_MOD_BUF_SIZE 81920 /* 640 KiB */ +#define DEF_MOD_BUF_SIZE 81920 struct darshan_fd_int_state;