Commit 96801d4a authored by Shane Snyder's avatar Shane Snyder

fix post-merge build errors

dev-modular should be completely merged into mmap-dev branch
parent 265bdaba
......@@ -1625,7 +1625,7 @@ void darshan_core_register_module(
/* register module with darshan */
darshan_core->mod_array[mod_id] = mod;
darshan_core->log_header.mod_ver[mod_id] = darshan_module_versions[mod_id];
darshan_core->log_hdr_p->mod_ver[mod_id] = darshan_module_versions[mod_id];
DARSHAN_CORE_UNLOCK();
/* set the memory alignment and calling process's rank, if desired */
......
......@@ -18,6 +18,8 @@ DARSHAN_MOD_LOGUTIL_HEADERS = darshan-posix-logutils.h darshan-mpiio-logutils.h
DARSHAN_STATIC_MOD_OBJS = darshan-posix-logutils.o darshan-mpiio-logutils.o darshan-hdf5-logutils.o darshan-pnetcdf-logutils.o darshan-bgq-logutils.o
DARSHAN_DYNAMIC_MOD_OBJS = darshan-posix-logutils.po darshan-mpiio-logutils.po darshan-hdf5-logutils.po darshan-pnetcdf-logutils.po darshan-bgq-logutils.po
#XXX BGQ
DARSHAN_ENABLE_SHARED=@DARSHAN_ENABLE_SHARED@
VPATH = $(srcdir)
......@@ -106,7 +108,7 @@ darshan-parser: darshan-parser.c darshan-logutils.h $(DARSHAN_LOG_FORMAT) $(DARS
$(CC) $(CFLAGS) $(LDFLAGS) $< libdarshan-util.a -o $@ $(LIBS)
darshan-stitch-logs: darshan-stitch-logs.c darshan-logutils.h $(DARSHAN_LOG_FORMAT) $(DARSHAN_MOD_LOGUTIL_HEADERS) $(DARSHAN_MOD_LOG_FORMATS) libdarshan-util.a | uthash-1.9.2
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
$(CC) $(CFLAGS) $(LDFLAGS) $< libdarshan-util.a -o $@ $(LIBS)
#test/gztest: test/gztest.c mktestdir
# $(CC) $(CFLAGS) $(LDFLAGS) -lz $< -o $@
......
......@@ -37,6 +37,7 @@ static void darshan_log_print_bgq_rec(void *file_rec,
static void darshan_log_print_bgq_description(void);
static void darshan_log_print_bgq_rec_diff(void *file_rec1, char *file_name1,
void *file_rec2, char *file_name2);
static void darshan_log_agg_bgq_recs(void *rec, void *agg_rec, int init_flag);
struct darshan_mod_logutil_funcs bgq_logutils =
{
......@@ -45,7 +46,7 @@ struct darshan_mod_logutil_funcs bgq_logutils =
.log_print_record = &darshan_log_print_bgq_rec,
.log_print_description = &darshan_log_print_bgq_description,
.log_print_diff = &darshan_log_print_bgq_rec_diff,
.log_agg_records = NULL /* TODO: how would aggregation work for the BG/Q module ? */
.log_agg_records = &darshan_log_agg_bgq_recs
};
static int darshan_log_get_bgq_rec(darshan_fd fd, void* bgq_buf)
......@@ -149,7 +150,7 @@ static void darshan_log_print_bgq_rec_diff(void *file_rec1, char *file_name1,
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file1->rank, file1->f_id, bgq_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, bgq_counter_names[i],
file1->counters[i], file_name1, "", "");
}
......@@ -157,18 +158,18 @@ static void darshan_log_print_bgq_rec_diff(void *file_rec1, char *file_name1,
{
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file2->rank, file2->f_id, bgq_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, bgq_counter_names[i],
file2->counters[i], file_name2, "", "");
}
else if(file1->counters[i] != file2->counters[i])
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file1->rank, file1->f_id, bgq_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, bgq_counter_names[i],
file1->counters[i], file_name1, "", "");
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file2->rank, file2->f_id, bgq_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, bgq_counter_names[i],
file2->counters[i], file_name2, "", "");
}
}
......@@ -179,7 +180,7 @@ static void darshan_log_print_bgq_rec_diff(void *file_rec1, char *file_name1,
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file1->rank, file1->f_id, bgq_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, bgq_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
}
......@@ -187,18 +188,18 @@ static void darshan_log_print_bgq_rec_diff(void *file_rec1, char *file_name1,
{
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file2->rank, file2->f_id, bgq_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, bgq_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
else if(file1->fcounters[i] != file2->fcounters[i])
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file1->rank, file1->f_id, bgq_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, bgq_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
file2->rank, file2->f_id, bgq_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, bgq_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
}
......@@ -207,6 +208,12 @@ static void darshan_log_print_bgq_rec_diff(void *file_rec1, char *file_name1,
}
static void darshan_log_agg_bgq_recs(void *rec, void *agg_rec, int init_flag)
{
/* TODO: how would aggregation work for the BG/Q module ? */
return;
}
/*
* Local variables:
* c-indent-level: 4
......
......@@ -145,7 +145,7 @@ static void darshan_log_print_hdf5_file_diff(void *file_rec1, char *file_name1,
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file1->rank, file1->f_id, hdf5_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, hdf5_counter_names[i],
file1->counters[i], file_name1, "", "");
}
......@@ -153,18 +153,18 @@ static void darshan_log_print_hdf5_file_diff(void *file_rec1, char *file_name1,
{
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file2->rank, file2->f_id, hdf5_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, hdf5_counter_names[i],
file2->counters[i], file_name2, "", "");
}
else if(file1->counters[i] != file2->counters[i])
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file1->rank, file1->f_id, hdf5_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, hdf5_counter_names[i],
file1->counters[i], file_name1, "", "");
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file2->rank, file2->f_id, hdf5_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, hdf5_counter_names[i],
file2->counters[i], file_name2, "", "");
}
}
......@@ -175,7 +175,7 @@ static void darshan_log_print_hdf5_file_diff(void *file_rec1, char *file_name1,
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file1->rank, file1->f_id, hdf5_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, hdf5_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
}
......@@ -183,18 +183,18 @@ static void darshan_log_print_hdf5_file_diff(void *file_rec1, char *file_name1,
{
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file2->rank, file2->f_id, hdf5_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, hdf5_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
else if(file1->fcounters[i] != file2->fcounters[i])
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file1->rank, file1->f_id, hdf5_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, hdf5_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_HDF5_MOD],
file2->rank, file2->f_id, hdf5_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, hdf5_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
}
......
......@@ -106,13 +106,6 @@ struct darshan_mod_logutil_funcs
void *agg_rec,
int init_flag
);
/* print a text diff of 2 module I/O records */
void (*log_print_diff)(
void *rec1,
char *name1,
void *rec2,
char *name2
);
};
extern struct darshan_mod_logutil_funcs *mod_logutils[];
......
......@@ -167,7 +167,7 @@ static void darshan_log_print_mpiio_file_diff(void *file_rec1, char *file_name1,
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file1->rank, file1->f_id, mpiio_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, mpiio_counter_names[i],
file1->counters[i], file_name1, "", "");
}
......@@ -175,18 +175,18 @@ static void darshan_log_print_mpiio_file_diff(void *file_rec1, char *file_name1,
{
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file2->rank, file2->f_id, mpiio_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, mpiio_counter_names[i],
file2->counters[i], file_name2, "", "");
}
else if(file1->counters[i] != file2->counters[i])
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file1->rank, file1->f_id, mpiio_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, mpiio_counter_names[i],
file1->counters[i], file_name1, "", "");
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file2->rank, file2->f_id, mpiio_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, mpiio_counter_names[i],
file2->counters[i], file_name2, "", "");
}
}
......@@ -197,7 +197,7 @@ static void darshan_log_print_mpiio_file_diff(void *file_rec1, char *file_name1,
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file1->rank, file1->f_id, mpiio_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, mpiio_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
}
......@@ -205,18 +205,18 @@ static void darshan_log_print_mpiio_file_diff(void *file_rec1, char *file_name1,
{
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file2->rank, file2->f_id, mpiio_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, mpiio_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
else if(file1->fcounters[i] != file2->fcounters[i])
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file1->rank, file1->f_id, mpiio_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, mpiio_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_MPIIO_MOD],
file2->rank, file2->f_id, mpiio_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, mpiio_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
}
......
......@@ -166,7 +166,7 @@ static void darshan_log_print_null_record_diff(void *file_rec1, char *file_name1
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file1->rank, file1->f_id, null_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, null_counter_names[i],
file1->counters[i], file_name1, "", "");
}
......@@ -174,18 +174,18 @@ static void darshan_log_print_null_record_diff(void *file_rec1, char *file_name1
{
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file2->rank, file2->f_id, null_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, null_counter_names[i],
file2->counters[i], file_name2, "", "");
}
else if(file1->counters[i] != file2->counters[i])
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file1->rank, file1->f_id, null_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, null_counter_names[i],
file1->counters[i], file_name1, "", "");
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file2->rank, file2->f_id, null_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, null_counter_names[i],
file2->counters[i], file_name2, "", "");
}
}
......@@ -196,7 +196,7 @@ static void darshan_log_print_null_record_diff(void *file_rec1, char *file_name1
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file1->rank, file1->f_id, null_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, null_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
}
......@@ -204,18 +204,18 @@ static void darshan_log_print_null_record_diff(void *file_rec1, char *file_name1
{
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file2->rank, file2->f_id, null_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, null_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
else if(file1->fcounters[i] != file2->fcounters[i])
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file1->rank, file1->f_id, null_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, null_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
file2->rank, file2->f_id, null_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, null_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
}
......
......@@ -447,7 +447,7 @@ int main(int argc, char **argv)
if(mask & OPTION_BASE)
{
/* print the corresponding module data for this record */
mod_logutils[i]->log_print_record(mod_buf, ref->rec.name,
mod_logutils[i]->log_print_record(mod_buf, ref->name,
mnt_pt, fs_type, fd->mod_ver[i]);
}
......
......@@ -146,7 +146,7 @@ static void darshan_log_print_pnetcdf_file_diff(void *file_rec1, char *file_name
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file1->rank, file1->f_id, pnetcdf_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, pnetcdf_counter_names[i],
file1->counters[i], file_name1, "", "");
}
......@@ -154,18 +154,18 @@ static void darshan_log_print_pnetcdf_file_diff(void *file_rec1, char *file_name
{
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file2->rank, file2->f_id, pnetcdf_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, pnetcdf_counter_names[i],
file2->counters[i], file_name2, "", "");
}
else if(file1->counters[i] != file2->counters[i])
{
printf("- ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file1->rank, file1->f_id, pnetcdf_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, pnetcdf_counter_names[i],
file1->counters[i], file_name1, "", "");
printf("+ ");
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file2->rank, file2->f_id, pnetcdf_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, pnetcdf_counter_names[i],
file2->counters[i], file_name2, "", "");
}
}
......@@ -176,7 +176,7 @@ static void darshan_log_print_pnetcdf_file_diff(void *file_rec1, char *file_name
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file1->rank, file1->f_id, pnetcdf_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, pnetcdf_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
}
......@@ -184,18 +184,18 @@ static void darshan_log_print_pnetcdf_file_diff(void *file_rec1, char *file_name
{
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file2->rank, file2->f_id, pnetcdf_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, pnetcdf_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
else if(file1->fcounters[i] != file2->fcounters[i])
{
printf("- ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file1->rank, file1->f_id, pnetcdf_f_counter_names[i],
file1->base_rec.rank, file1->base_rec.id, pnetcdf_f_counter_names[i],
file1->fcounters[i], file_name1, "", "");
printf("+ ");
DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_PNETCDF_MOD],
file2->rank, file2->f_id, pnetcdf_f_counter_names[i],
file2->base_rec.rank, file2->base_rec.id, pnetcdf_f_counter_names[i],
file2->fcounters[i], file_name2, "", "");
}
}
......
......@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
/* iterate over active darshan modules and gather module data to write
* to the stitched together output log
*/
for(i = 0; i < DARSHAN_MPIIO_MOD; i++)
for(i = 0; i < DARSHAN_MAX_MODS; i++)
{
if(!mod_logutils[i]) continue;
......@@ -424,21 +424,6 @@ int main(int argc, char *argv[])
return(-1);
}
/* write out the shared records first */
HASH_ITER(hlink, shared_rec_hash, sref, stmp)
{
ret = mod_logutils[i]->log_put_record(stitch_fd, sref->agg_rec);
if(ret < 0)
{
fprintf(stderr,
"Error: unable to write %s module record to output darshan log.\n",
darshan_module_names[i]);
globfree(&globbuf);
darshan_log_close(stitch_fd);
unlink(stitch_logname);
return(-1);
}
}
}
for(j = 0; j < globbuf.gl_pathc; j++)
......@@ -456,6 +441,25 @@ int main(int argc, char *argv[])
return(-1);
}
if(j == 0 && shared_rec_hash)
{
/* write out the shared records first */
HASH_ITER(hlink, shared_rec_hash, sref, stmp)
{
ret = mod_logutils[i]->log_put_record(stitch_fd, sref->agg_rec, in_fd->mod_ver[i]);
if(ret < 0)
{
fprintf(stderr,
"Error: unable to write %s module record to output darshan log.\n",
darshan_module_names[i]);
globfree(&globbuf);
darshan_log_close(stitch_fd);
unlink(stitch_logname);
return(-1);
}
}
}
/* loop over module records and write them to output file */
while((ret = mod_logutils[i]->log_get_record(in_fd, mod_buf)) == 1)
{
......@@ -465,7 +469,7 @@ int main(int argc, char *argv[])
if(sref)
continue; /* skip shared records */
ret = mod_logutils[i]->log_put_record(stitch_fd, mod_buf);
ret = mod_logutils[i]->log_put_record(stitch_fd, mod_buf, in_fd->mod_ver[i]);
if(ret < 0)
{
fprintf(stderr,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment