Commit a9dbd195 authored by Shane Snyder's avatar Shane Snyder
Browse files

more detailed darshan-parser output

parent 85729752
...@@ -187,8 +187,6 @@ static void darshan_log_print_bgq_description() ...@@ -187,8 +187,6 @@ static void darshan_log_print_bgq_description()
printf("# BGQ_TORUSENABLED: which dimensions of the torus are enabled.\n"); printf("# BGQ_TORUSENABLED: which dimensions of the torus are enabled.\n");
printf("# BGQ_F_TIMESTAMP: timestamp when the BGQ data was collected.\n"); printf("# BGQ_F_TIMESTAMP: timestamp when the BGQ data was collected.\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
...@@ -143,8 +143,6 @@ static void darshan_log_print_hdf5_description() ...@@ -143,8 +143,6 @@ static void darshan_log_print_hdf5_description()
printf("# HDF5_F_OPEN_TIMESTAMP: timestamp of first HDF5 file open.\n"); printf("# HDF5_F_OPEN_TIMESTAMP: timestamp of first HDF5 file open.\n");
printf("# HDF5_F_CLOSE_TIMESTAMP: timestamp of last HDF5 file close.\n"); printf("# HDF5_F_CLOSE_TIMESTAMP: timestamp of last HDF5 file close.\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
...@@ -168,8 +168,6 @@ static void darshan_log_print_lustre_description() ...@@ -168,8 +168,6 @@ static void darshan_log_print_lustre_description()
printf("# LUSTRE_STRIPE_WIDTH: number of OSTs over which file is striped.\n"); printf("# LUSTRE_STRIPE_WIDTH: number of OSTs over which file is striped.\n");
printf("# LUSTRE_OST_ID_*: indices of OSTs over which the file is striped.\n"); printf("# LUSTRE_OST_ID_*: indices of OSTs over which the file is striped.\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
...@@ -165,8 +165,6 @@ static void darshan_log_print_mpiio_description() ...@@ -165,8 +165,6 @@ static void darshan_log_print_mpiio_description()
printf("# MPIIO_F_*_RANK_TIME: fastest and slowest I/O time for a single rank (for shared files).\n"); printf("# MPIIO_F_*_RANK_TIME: fastest and slowest I/O time for a single rank (for shared files).\n");
printf("# MPIIO_F_VARIANCE_RANK_*: variance of total I/O time and bytes moved for all ranks (for shared files).\n"); printf("# MPIIO_F_VARIANCE_RANK_*: variance of total I/O time and bytes moved for all ranks (for shared files).\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
...@@ -419,7 +419,10 @@ int main(int argc, char **argv) ...@@ -419,7 +419,10 @@ int main(int argc, char **argv)
{ {
/* print a header describing the module's I/O characterization data */ /* print a header describing the module's I/O characterization data */
if(mod_logutils[i]->log_print_description) if(mod_logutils[i]->log_print_description)
{
mod_logutils[i]->log_print_description(); mod_logutils[i]->log_print_description();
DARSHAN_PRINT_HEADER();
}
} }
ret = mod_logutils[i]->log_get_record(fd, (void **)&mod_buf); ret = mod_logutils[i]->log_get_record(fd, (void **)&mod_buf);
...@@ -572,8 +575,18 @@ int main(int argc, char **argv) ...@@ -572,8 +575,18 @@ int main(int argc, char **argv)
stdio_calc_file(file_hash, &fdata); stdio_calc_file(file_hash, &fdata);
} }
printf("\n# files\n"); printf("\n# Total file counts\n");
printf("# -----\n"); printf("# -----\n");
printf("# <file_type>: type of file access:\n");
printf("# *read_only: file was only read\n");
printf("# *write_only: file was only written\n");
printf("# *read_write: file was read and written\n");
printf("# *unique: file was opened by a single process only\n");
printf("# *shared: file was accessed by a group of processes (maybe all processes)\n");
printf("# <file_count> total number of files of this type\n");
printf("# <total_bytes> total number of bytes moved to/from files of this type\n");
printf("# <max_byte_offset> maximum byte offset accessed for a file of this type\n");
printf("\n# <file_type> <file_count> <total_bytes> <max_byte_offset>\n");
printf("# total: %" PRId64 " %" PRId64 " %" PRId64 "\n", printf("# total: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.total, fdata.total,
fdata.total_size, fdata.total_size,
...@@ -1684,6 +1697,8 @@ void calc_perf(perf_data_t *pdata, ...@@ -1684,6 +1697,8 @@ void calc_perf(perf_data_t *pdata,
void stdio_print_total_file(struct darshan_stdio_file *pfile) void stdio_print_total_file(struct darshan_stdio_file *pfile)
{ {
int i; int i;
mod_logutils[DARSHAN_STDIO_MOD]->log_print_description();
printf("\n"); printf("\n");
for(i = 0; i < STDIO_NUM_INDICES; i++) for(i = 0; i < STDIO_NUM_INDICES; i++)
{ {
...@@ -1701,6 +1716,8 @@ void stdio_print_total_file(struct darshan_stdio_file *pfile) ...@@ -1701,6 +1716,8 @@ void stdio_print_total_file(struct darshan_stdio_file *pfile)
void posix_print_total_file(struct darshan_posix_file *pfile) void posix_print_total_file(struct darshan_posix_file *pfile)
{ {
int i; int i;
mod_logutils[DARSHAN_POSIX_MOD]->log_print_description();
printf("\n"); printf("\n");
for(i = 0; i < POSIX_NUM_INDICES; i++) for(i = 0; i < POSIX_NUM_INDICES; i++)
{ {
...@@ -1718,6 +1735,8 @@ void posix_print_total_file(struct darshan_posix_file *pfile) ...@@ -1718,6 +1735,8 @@ void posix_print_total_file(struct darshan_posix_file *pfile)
void mpiio_print_total_file(struct darshan_mpiio_file *mfile) void mpiio_print_total_file(struct darshan_mpiio_file *mfile)
{ {
int i; int i;
mod_logutils[DARSHAN_MPIIO_MOD]->log_print_description();
printf("\n"); printf("\n");
for(i = 0; i < MPIIO_NUM_INDICES; i++) for(i = 0; i < MPIIO_NUM_INDICES; i++)
{ {
...@@ -1765,6 +1784,7 @@ void stdio_file_list(hash_entry_t *file_hash, ...@@ -1765,6 +1784,7 @@ void stdio_file_list(hash_entry_t *file_hash,
printf("\n# Per-file summary of I/O activity (detailed).\n"); printf("\n# Per-file summary of I/O activity (detailed).\n");
else else
printf("\n# Per-file summary of I/O activity.\n"); printf("\n# Per-file summary of I/O activity.\n");
printf("# -----\n");
printf("# <record_id>: darshan record id for this file\n"); printf("# <record_id>: darshan record id for this file\n");
printf("# <file_name>: full file name\n"); printf("# <file_name>: full file name\n");
...@@ -1851,6 +1871,7 @@ void posix_file_list(hash_entry_t *file_hash, ...@@ -1851,6 +1871,7 @@ void posix_file_list(hash_entry_t *file_hash,
printf("\n# Per-file summary of I/O activity (detailed).\n"); printf("\n# Per-file summary of I/O activity (detailed).\n");
else else
printf("\n# Per-file summary of I/O activity.\n"); printf("\n# Per-file summary of I/O activity.\n");
printf("# -----\n");
printf("# <record_id>: darshan record id for this file\n"); printf("# <record_id>: darshan record id for this file\n");
printf("# <file_name>: full file name\n"); printf("# <file_name>: full file name\n");
...@@ -1859,8 +1880,8 @@ void posix_file_list(hash_entry_t *file_hash, ...@@ -1859,8 +1880,8 @@ void posix_file_list(hash_entry_t *file_hash,
printf("# <avg>: average time in seconds consumed in IO per process\n"); printf("# <avg>: average time in seconds consumed in IO per process\n");
if(detail_flag) if(detail_flag)
{ {
printf("# <start_{open/read/write}>: start timestamp of first open, read, or write\n"); printf("# <start_{open/read/write/close}>: start timestamp of first open, read, write, or close\n");
printf("# <end_{read/write/close}>: end timestamp of last read, write, or close\n"); printf("# <end_{open/read/write/close}>: end timestamp of last open, read, write, or close\n");
printf("# <posix_opens>: POSIX open calls\n"); printf("# <posix_opens>: POSIX open calls\n");
printf("# <POSIX_SIZE_READ_*>: POSIX read size histogram\n"); printf("# <POSIX_SIZE_READ_*>: POSIX read size histogram\n");
printf("# <POSIX_SIZE_WRITE_*>: POSIX write size histogram\n"); printf("# <POSIX_SIZE_WRITE_*>: POSIX write size histogram\n");
...@@ -1943,6 +1964,7 @@ void mpiio_file_list(hash_entry_t *file_hash, ...@@ -1943,6 +1964,7 @@ void mpiio_file_list(hash_entry_t *file_hash,
printf("\n# Per-file summary of I/O activity (detailed).\n"); printf("\n# Per-file summary of I/O activity (detailed).\n");
else else
printf("\n# Per-file summary of I/O activity.\n"); printf("\n# Per-file summary of I/O activity.\n");
printf("# -----\n");
printf("# <record_id>: darshan record id for this file\n"); printf("# <record_id>: darshan record id for this file\n");
printf("# <file_name>: full file name\n"); printf("# <file_name>: full file name\n");
......
...@@ -144,8 +144,6 @@ static void darshan_log_print_pnetcdf_description() ...@@ -144,8 +144,6 @@ static void darshan_log_print_pnetcdf_description()
printf("# PNETCDF_F_OPEN_TIMESTAMP: timestamp of first PNETCDF file open.\n"); printf("# PNETCDF_F_OPEN_TIMESTAMP: timestamp of first PNETCDF file open.\n");
printf("# PNETCDF_F_CLOSE_TIMESTAMP: timestamp of last PNETCDF file close.\n"); printf("# PNETCDF_F_CLOSE_TIMESTAMP: timestamp of last PNETCDF file close.\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
...@@ -227,8 +227,6 @@ static void darshan_log_print_posix_description() ...@@ -227,8 +227,6 @@ static void darshan_log_print_posix_description()
printf("# POSIX_F_*_RANK_TIME: fastest and slowest I/O time for a single rank (for shared files).\n"); printf("# POSIX_F_*_RANK_TIME: fastest and slowest I/O time for a single rank (for shared files).\n");
printf("# POSIX_F_VARIANCE_RANK_*: variance of total I/O time and bytes moved for all ranks (for shared files).\n"); printf("# POSIX_F_VARIANCE_RANK_*: variance of total I/O time and bytes moved for all ranks (for shared files).\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
...@@ -168,8 +168,6 @@ static void darshan_log_print_stdio_description() ...@@ -168,8 +168,6 @@ static void darshan_log_print_stdio_description()
printf("# STDIO_F_*_RANK_TIME: fastest and slowest I/O time for a single rank (for shared files).\n"); printf("# STDIO_F_*_RANK_TIME: fastest and slowest I/O time for a single rank (for shared files).\n");
printf("# STDIO_F_VARIANCE_RANK_*: variance of total I/O time and bytes moved for all ranks (for shared files).\n"); printf("# STDIO_F_VARIANCE_RANK_*: variance of total I/O time and bytes moved for all ranks (for shared files).\n");
DARSHAN_PRINT_HEADER();
return; return;
} }
......
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