Commit e7f180dc authored by Philip Carns's avatar Philip Carns

update rest of darshan-job-summary for STDIO mod

parent 715368e5
......@@ -211,7 +211,7 @@ while($line = <PARSE_OUT>)
$summary{$fields[3]} += $fields[4];
# accumulate independent and shared data as well as fs data
if ($fields[3] eq "POSIX_F_READ_TIME")
if ($fields[3] eq "POSIX_F_READ_TIME" || $fields[3] eq "STDIO_F_READ_TIME")
{
if ($fields[1] == -1)
{
......@@ -222,7 +222,7 @@ while($line = <PARSE_OUT>)
$cumul_read_indep += $fields[4];
}
}
elsif ($fields[3] eq "POSIX_F_WRITE_TIME")
elsif ($fields[3] eq "POSIX_F_WRITE_TIME" || $fields[3] eq "STDIO_F_WRITE_TIME")
{
if ($fields[1] == -1)
{
......@@ -233,7 +233,7 @@ while($line = <PARSE_OUT>)
$cumul_write_indep += $fields[4];
}
}
elsif ($fields[3] eq "POSIX_F_META_TIME")
elsif ($fields[3] eq "POSIX_F_META_TIME" || $fields[3] eq "STDIO_F_META_TIME")
{
if ($fields[1] == -1)
{
......@@ -244,7 +244,7 @@ while($line = <PARSE_OUT>)
$cumul_meta_indep += $fields[4];
}
}
elsif ($fields[3] eq "POSIX_BYTES_READ")
elsif ($fields[3] eq "POSIX_BYTES_READ" || $fields[3] eq "STDIO_BYTES_READ")
{
if ($fields[1] == -1)
{
......@@ -260,7 +260,7 @@ while($line = <PARSE_OUT>)
}
$fs_data{$fields[6]}->[0] += $fields[4];
}
elsif ($fields[3] eq "POSIX_BYTES_WRITTEN")
elsif ($fields[3] eq "POSIX_BYTES_WRITTEN" || $fields[3] eq "STDIO_BYTES_WRITTEN")
{
if ($fields[1] == -1)
{
......@@ -278,12 +278,13 @@ while($line = <PARSE_OUT>)
}
# record start and end of reads and writes
elsif ($fields[3] eq "POSIX_F_READ_START_TIMESTAMP")
elsif ($fields[3] eq "POSIX_F_READ_START_TIMESTAMP" ||
$fields[3] eq "STDIO_F_READ_START_TIMESTAMP")
{
# store until we find the end
$last_read_start = $fields[4];
}
elsif ($fields[3] eq "POSIX_F_READ_END_TIMESTAMP" && $fields[4] != 0)
elsif (($fields[3] eq "POSIX_F_READ_END_TIMESTAMP" || $fields[3] eq "STDIO_F_READ_END_TIMESTAMP") && $fields[4] != 0)
{
# assume we got the read start already
my $xdelta = $fields[4] - $last_read_start;
......@@ -296,12 +297,13 @@ while($line = <PARSE_OUT>)
print FA_READ "$last_read_start\t$fields[1]\t$xdelta\t0\n";
}
}
elsif ($fields[3] eq "POSIX_F_WRITE_START_TIMESTAMP")
elsif ($fields[3] eq "POSIX_F_WRITE_START_TIMESTAMP" ||
$fields[3] eq "STDIO_F_WRITE_START_TIMESTAMP")
{
# store until we find the end
$last_write_start = $fields[4];
}
elsif ($fields[3] eq "POSIX_F_WRITE_END_TIMESTAMP" && $fields[4] != 0)
elsif (($fields[3] eq "POSIX_F_WRITE_END_TIMESTAMP" || $fields[3] eq "STDIO_F_WRITE_END_TIMESTAMP") && $fields[4] != 0)
{
# assume we got the write start already
my $xdelta = $fields[4] - $last_write_start;
......@@ -877,7 +879,7 @@ open(FS_TABLE, ">$tmp_dir/fs-data-table.tex") || die("error opening output files
print FS_TABLE "
\\begin{tabular}{c|r|r|r|r}
\\multicolumn{5}{c}{ } \\\\
\\multicolumn{5}{c}{Data Transfer Per Filesystem (POSIX)} \\\\
\\multicolumn{5}{c}{Data Transfer Per Filesystem (POSIX and STDIO)} \\\\
\\hline
\\multirow{2}{*}{File System} \& \\multicolumn{2}{c}{Write} \\vline \& \\multicolumn{2}{c}{Read} \\\\
\\cline{2-5}
......@@ -926,7 +928,7 @@ open(VAR_TABLE, ">$tmp_dir/variance-table.tex") || die("error opening output fil
print VAR_TABLE "
\\begin{tabular}{c|r|r|r|r|r|r|r|r|r}
\\multicolumn{10}{c}{} \\\\
\\multicolumn{10}{c}{Variance in Shared Files (POSIX)} \\\\
\\multicolumn{10}{c}{Variance in Shared Files (POSIX and STDIO)} \\\\
\\hline
File \& Processes \& \\multicolumn{3}{c}{Fastest} \\vline \&
\\multicolumn{3}{c}{Slowest} \\vline \& \\multicolumn{2}{c}{\$\\sigma\$} \\\\
......
......@@ -8,7 +8,7 @@ set xdata time
set timefmt "%s"
set format x "%H:%M:%S"
set yrange [-1:ymax]
set title "Timespan from first to last read access on independent files (POSIX)"
set title "Timespan from first to last read access on independent files (POSIX and STDIO)"
set xrange ["0":runtime]
set ytics 0,yinc,ymaxtic
set lmargin 6
......@@ -25,7 +25,7 @@ set style increment user
plot "file-access-read.dat" using 1:2:3:4 with vectors nohead filled notitle
set output "file-access-write.eps"
set title "Timespan from first to last write access on independent files (POSIX)"
set title "Timespan from first to last write access on independent files (POSIX and STDIO)"
# lw 3 to make lines thicker...
plot "file-access-write.dat" using 1:2:3:4 with vectors nohead filled lt 2 notitle
......@@ -34,7 +34,7 @@ set output "file-access-shared.eps"
unset ytics
set ylabel "All processes"
set yrange [-1:1]
set title "Timespan from first to last access on files shared by all processes (POSIX)"
set title "Timespan from first to last access on files shared by all processes (POSIX and STDIO)"
plot "file-access-read-sh.dat" using 1:2:3:4 with vectors nohead filled lw 10 title "read", \
"file-access-write-sh.dat" using 1:(($2)-.2):3:4 with vectors nohead filled lw 10 title "write"
\begin{tabular}{l|p{1.7in}r}
\multicolumn{3}{c}{Average I/O per process (POSIX)} \\
\multicolumn{3}{c}{Average I/O per process (POSIX and STDIO)} \\
\hline
& Cumulative time spent in I/O functions (seconds) & Amount of I/O (MB) \\
\hline
......
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