Recent changes (master)
The following changes since commit 428b4f6ba681dbb40c8e2213d0c6ae8f8049dcd5:
fio2gnuplot: Adding filename as title for 2D graphs (2013-07-31 12:32:40 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Erwan Velu (8):
fio2gnuplot: Fixing typo when inserting fake data
fio2gnuplot: Print line if int() conversion fails
fio2gnuplot: Adding time selection options
fio2gnplot: Renaming file variable to myfile
fio2gnuplot: Fixing plotting issues on shorten files
fio2gnuplot: Plotting average value for compare graphs
fio2gnuplot: Display average value in label
iolog: Logging blocksize in IOPS traces
Martin Steigerwald (1):
Make test for gnuplot work with empty strings.
io_u.c | 2 +- iolog.h | 3 +- stat.c | 4 +- tools/fio_generate_plots | 2 +- tools/plot/fio2gnuplot.py | 79 +++++++++++++++++++++++++++++---------------- tools/plot/graph2D.gpm | 6 ++-- tools/plot/math.gpm | 2 +- 7 files changed, 61 insertions(+), 37 deletions(-)
---
Diff of recent changes:
io_u.c +1 -1
@@ -1412,7 +1412,7 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,if (!td->o.disable_bw)add_bw_sample (td, idx, bytes, &icd->time); -add_iops_sample (td, idx, &icd->time); +add_iops_sample (td, idx, bytes, &icd->time); }static long long usec_for_io (struct thread_data *td,enum fio_ddir ddir)
iolog.h +2 -1
@@ -118,7 +118,8 @@ extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long, unsigned int);extern void add_bw_sample (struct thread_data *,enum fio_ddir ,unsigned int ,struct timeval *); -extern void add_iops_sample (struct thread_data *,enum fio_ddir ,struct timeval *); +extern void add_iops_sample (struct thread_data *,enum fio_ddir ,unsigned int , +struct timeval *);extern void init_disk_util (struct thread_data *);extern void update_rusage_stat (struct thread_data *);extern void setup_log (struct io_log **,unsigned long ,int );
stat.c +2 -2
@@ -1691,7 +1691,7 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,fio_gettime (&td->bw_sample_time,NULL ); } -void add_iops_sample (struct thread_data *td,enum fio_ddir ddir, +void add_iops_sample (struct thread_data *td,enum fio_ddir ddir,unsigned int bs,struct timeval *t) {struct thread_stat *ts = &td->ts;
@@ -1718,7 +1718,7 @@ void add_iops_sample(struct thread_data *td, enum fio_ddir ddir,add_stat_sample (&ts->iops_stat[ddir], iops);if (td->iops_log) -add_log_sample (td, td->iops_log, iops, ddir,0 ); +add_log_sample (td, td->iops_log, iops, ddir, bs); td->stat_io_blocks[ddir] = td->this_io_blocks[ddir]; }
tools/fio_generate_plots +1 -1
@@ -22,7 +22,7 @@ if [ -z "$1" ]; then fi GNUPLOT=$(which gnuplot) -if [ ! -x $GNUPLOT ] +if [ ! -x "$GNUPLOT" ] then echo You need gnuplot installed to generate graphs exit 1
tools/plot/fio2gnuplot.py +51 -28
162 lines not on this page · raw message
tools/plot/graph2D.gpm +3 -3
@@ -22,13 +22,13 @@ set yrange [0:] set style line 100 lt 7 lw 0.5 set style line 1 lt 1 lw 3 pt 3 linecolor rgb "green" -plot '$1' using 2:3 with linespoints title '$2', $7 w l ls 1 ti 'Global average value' +plot '$1' using 2:3 with linespoints title '$2', $7 w l ls 1 ti 'Global average value ($7)' set output '$5.png' -plot '$1' using 2:3 smooth csplines title '$2', $7 w l ls 1 ti 'Global average value' +plot '$1' using 2:3 smooth csplines title '$2', $7 w l ls 1 ti 'Global average value ($7)' set output '$6.png' -plot '$1' using 2:3 smooth bezier title '$2', $7 w l ls 1 ti 'Global average value' +plot '$1' using 2:3 smooth bezier title '$2', $7 w l ls 1 ti 'Global average value ($7)' #pause -1 #The End
tools/plot/math.gpm +1 -1
@@ -22,4 +22,4 @@ set xtics axis out set xtic rotate by 45 scale 0 font ",8" autojustify set xtics offset 0,-1 border -5,1,5 set style line 1 lt 1 lw 3 pt 3 linecolor rgb "green" -plot '$1' using 2:xtic(1) ti col, $5 w l ls 1 ti 'Global average value' +plot '$1' using 2:xtic(1) ti col, $5 w l ls 1 ti 'Global average value ($5)'