GitLab maintenance scheduled for Today, 2019-09-24, from 12:00 to 13:00 CT - Services will be unavailable during this time.

...
 
Commits (8)
......@@ -18,7 +18,7 @@ darshan-2.0.0
* darshan-job-summary.pl:
* opens output files directly without using intermediate darshan-parser output
* table showing data usage per file system
* table showing I/O variance in shared files
* table showing I/O balance in shared files
* Fixes for bugs reported by Noah Watkins:
* avoid name collision in hashing function
* divide by zero error in darshan-job-summary.pl
......
......@@ -4107,7 +4107,7 @@ CFLAGS="$old_cflags"
# libc functions wrapped by darshan
CP_WRAPPERS="-Wl,-u,MPI_Wtime,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose"
CP_WRAPPERS="-Wl,-u,MPI_Wtime,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,ncmpi_iput_vara,-wrap,ncmpi_put_vara_all,-wrap,ncmpi_put_vara_int_all,-wrap,ncmpi_wait_all,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose"
# ,-u,__wrap___fxstat64,-u,pthread_mutex_lock,-u,pthread_mutex_unlock
......
......@@ -133,7 +133,7 @@ CFLAGS="$old_cflags"
# libc functions wrapped by darshan
CP_WRAPPERS="-Wl,-u,MPI_Wtime,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose"
CP_WRAPPERS="-Wl,-u,MPI_Wtime,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,ncmpi_iput_vara,-wrap,ncmpi_put_vara_all,-wrap,ncmpi_put_vara_int_all,-wrap,ncmpi_wait_all,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose"
# ,-u,__wrap___fxstat64,-u,pthread_mutex_lock,-u,pthread_mutex_unlock
......
......@@ -12,7 +12,7 @@
#include "darshan-config.h"
/* update this on file format changes */
#define CP_VERSION "2.00"
#define CP_VERSION "2.01"
/* magic number for validating output files and checking byte order */
#define CP_MAGIC_NR 6567223
......@@ -211,6 +211,9 @@ enum f_darshan_indices
CP_F_SLOWEST_RANK_TIME,
CP_F_VARIANCE_RANK_TIME,
CP_F_VARIANCE_RANK_BYTES,
CP_F_NC_READ_TIME,
CP_F_NC_WRITE_TIME,
CP_F_NC_META_TIME,
CP_F_NUM_INDICES,
};
......
......@@ -180,7 +180,8 @@ char *darshan_f_names[] = {
"CP_F_SLOWEST_RANK_TIME",
"CP_F_VARIANCE_RANK_TIME",
"CP_F_VARIANCE_RANK_BYTES",
"CP_F_NC_READ_TIME", /* cumulative time in pnetcdf reads */
"CP_F_NC_WRITE_TIME", /* cumulative time in pnetcdf writes */
"CP_F_NUM_INDICES"
};
......@@ -248,7 +249,8 @@ int darshan_log_getjob(darshan_fd file, struct darshan_job *job)
return(-1);
}
if(strcmp(file->version, "2.00") == 0)
if( strcmp(file->version, "2.00") == 0 ||
strcmp(file->version, "2.01") == 0)
{
getjob_internal = getjob_internal_200;
getfile_internal = getfile_internal_200;
......@@ -430,9 +432,16 @@ void darshan_log_close(darshan_fd file)
*/
void darshan_log_print_version_warnings(struct darshan_job *job)
{
if(strcmp(job->version_string, "2.01") == 0)
{
/* curent version */
return;
}
if(strcmp(job->version_string, "2.00") == 0)
{
/* current version */
printf("#WARNING: version 2.00 log format does not support the following parameters:\n");
printf("# CP_F_NC_READ_TIME\n");
printf("# CP_F_NC_WRITE_TIME\n");
return;
}
......
......@@ -1402,7 +1402,7 @@ static void darshan_file_reduce(void* infile_v,
}
/* sum */
for(j=CP_F_POSIX_READ_TIME; j<=CP_F_MPI_WRITE_TIME; j++)
for(j=CP_F_POSIX_READ_TIME; j<=CP_F_NC_WRITE_TIME; j++)
{
tmp_file.fcounters[j] = infile->fcounters[j] +
inoutfile->fcounters[j];
......
This diff is collapsed.
......@@ -17,8 +17,8 @@ use Number::Bytes::Human qw(format_bytes);
my $gnuplot = "";
my $tmp_dir = tempdir( CLEANUP => 1 );
#my $tmp_dir = tempdir( CLEANUP => 0 );
#print "tmp dir: $tmp_dir\n";
my $tmp_dir = tempdir( CLEANUP => 0 );
print "tmp dir: $tmp_dir\n";
my $orig_dir = getcwd;
my $output_file = "summary.pdf";
......@@ -706,18 +706,27 @@ close(TABLES);
open(TIME, ">$tmp_dir/time-summary.dat") || die("error opening output file:$!\n");
print TIME "# <type>, <app time>, <read>, <write>, <meta>\n";
print TIME "POSIX, ", ((($runtime * $nprocs - $summary{CP_F_POSIX_READ_TIME} -
$summary{CP_F_POSIX_WRITE_TIME} -
$summary{CP_F_POSIX_META_TIME})/($runtime * $nprocs)) * 100);
print TIME ", ", (($summary{CP_F_POSIX_READ_TIME}/($runtime * $nprocs))*100);
print TIME ", ", (($summary{CP_F_POSIX_WRITE_TIME}/($runtime * $nprocs))*100);
print TIME ", ", (($summary{CP_F_POSIX_META_TIME}/($runtime * $nprocs))*100), "\n";
print TIME "MPI-IO, ", ((($runtime * $nprocs - $summary{CP_F_MPI_READ_TIME} -
$summary{CP_F_MPI_WRITE_TIME} -
$summary{CP_F_MPI_META_TIME})/($runtime * $nprocs)) * 100);
print TIME ", ", (($summary{CP_F_MPI_READ_TIME}/($runtime * $nprocs))*100);
print TIME ", ", (($summary{CP_F_MPI_WRITE_TIME}/($runtime * $nprocs))*100);
print TIME ", ", (($summary{CP_F_MPI_META_TIME}/($runtime * $nprocs))*100), "\n";
print TIME "PNETCDF, ", ((($runtime * $nprocs - $summary{CP_F_NC_READ_TIME} -
$summary{CP_F_NC_WRITE_TIME})/($runtime * $nprocs)) * 100);
print TIME ", ", (($summary{CP_F_NC_READ_TIME}/($runtime * $nprocs))*100);
print TIME ", ", (($summary{CP_F_NC_WRITE_TIME}/($runtime * $nprocs))*100);
print TIME ", ", (($summary{CP_F_NC_META_TIME}/($runtime * $nprocs))*100), "\n";
close TIME;
# copy template files to tmp tmp_dir
......