From: Erwan Velu Date: Tue, 30 Jul 2013 09:54:45 +0000 (+0200) Subject: Tree: Moving fio_generate_plots in tools/ X-Git-Tag: fio-2.1.2~16 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=0460eb92b25b65a9e99ce4fd61d1536bff255331 Tree: Moving fio_generate_plots in tools/ As fio2gnplot.py & genfio are located in tools, it sounds better to put all the additional tools in the same directory. --- diff --git a/Makefile b/Makefile index 8075eb2f..8494b27e 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ OPTFLAGS= -O3 -g -ffast-math CFLAGS = -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS) LIBS += -lm $(EXTLIBS) PROGS = fio -SCRIPTS = fio_generate_plots tools/plot/fio2gnuplot.py tools/genfio +SCRIPTS = tools/fio_generate_plots tools/plot/fio2gnuplot.py tools/genfio ifdef CONFIG_GFIO PROGS += gfio @@ -280,6 +280,6 @@ install: $(PROGS) $(SCRIPTS) FORCE $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 $(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 fio_generate_plots.1 $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 644 tools/fio_generate_plots.1 $(DESTDIR)$(mandir)/man1 $(INSTALL) -m 755 -d $(DESTDIR)$(sharedir) $(INSTALL) -m 644 tools/plot/*gpm $(DESTDIR)$(sharedir)/ diff --git a/fio_generate_plots b/fio_generate_plots deleted file mode 100755 index f65a326c..00000000 --- a/fio_generate_plots +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh -# -# This script is an almost total rewrite by Louwrentius -# of the original fio_generate_plots script provided as part of the FIO storage -# benchmark utiliy. I only retained how GNUplot is used to generate graphs, as -# that is something I know nothing about. -# -# The script uses the files generated by FIO to create nice graphs in the -# SVG format. This output format is supported by most modern browsers and -# allows resolution independant graphs to be generated. -# -# This script supports GNUPLOT 4.4 and higher. -# -# Version 1.0 @ 20121231 -# -# -# - -if [ -z "$1" ]; then - echo "Usage: fio_generate_plots subtitle [xres yres]" - exit 1 -fi - -GNUPLOT=$(which gnuplot) -if [ ! -x $GNUPLOT ] -then - echo You need gnuplot installed to generate graphs - exit 1 -fi - -TITLE="$1" - -# set resolution -if [ ! -z "$2" ] && [ ! -z "$3" ] -then - XRES="$2" - YRES="$3" -else - XRES=1280 - YRES=768 -fi - -if [ -z "$SAMPLE_DURATION" ] -then - SAMPLE_DURATION="*" -fi - -DEFAULT_GRID_LINE_TYPE=3 -DEFAULT_LINE_WIDTH=2 -DEFAULT_LINE_COLORS=" -set object 1 rectangle from screen 0,0 to screen 1,1 fillcolor rgb\"#ffffff\" behind -set style line 1 lc rgb \"#E41A1C\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 2 lc rgb \"#377EB8\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 3 lc rgb \"#4DAF4A\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 4 lc rgb \"#984EA3\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 5 lc rgb \"#FF7F00\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 6 lc rgb \"#DADA33\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 7 lc rgb \"#A65628\" lw $DEFAULT_LINE_WIDTH lt 1; -set style line 20 lc rgb \"#000000\" lt $DEFAULT_GRID_LINE_TYPE lw $DEFAULT_LINE_WIDTH; -" - -DEFAULT_TERMINAL="set terminal svg enhanced dashed size $XRES,$YRES dynamic" -DEFAULT_TITLE_FONT="\"Helvetica,28\"" -DEFAULT_AXIS_FONT="\"Helvetica,14\"" -DEFAULT_AXIS_LABEL_FONT="\"Helvetica,16\"" -DEFAULT_XLABEL="set xlabel \"Time (sec)\" font $DEFAULT_AXIS_LABEL_FONT" -DEFAULT_XTIC="set xtics font $DEFAULT_AXIS_FONT" -DEFAULT_YTIC="set ytics font $DEFAULT_AXIS_FONT" -DEFAULT_MXTIC="set mxtics 0" -DEFAULT_MYTIC="set mytics 2" -DEFAULT_XRANGE="set xrange [0:$SAMPLE_DURATION]" -DEFAULT_YRANGE="set yrange [0:*]" -DEFAULT_GRID="set grid ls 20" -DEFAULT_KEY="set key outside bottom center ; set key box enhanced spacing 2.0 samplen 3 horizontal width 4 height 1.2 " -DEFAULT_SOURCE="set label 30 \"Data source: http://example.com\" font $DEFAULT_AXIS_FONT tc rgb \"#00000f\" at screen 0.976,0.175 right" -DEFAULT_OPTS="$DEFAULT_LINE_COLORS ; $DEFAULT_GRID_LINE ; $DEFAULT_GRID ; $DEFAULT_GRID_MINOR ; $DEFAULT_XLABEL ; $DEFAULT_XRANGE ; $DEFAULT_YRANGE ; $DEFAULT_XTIC ; $DEFAULT_YTIC ; $DEFAULT_MXTIC ; $DEFAULT_MYTIC ; $DEFAULT_KEY ; $DEFAULT_TERMINAL ; $DEFAULT_SOURCE" - -plot () { - - if [ -z "$TITLE" ] - then - PLOT_TITLE=" set title \"$1\" font $DEFAULT_TITLE_FONT" - else - PLOT_TITLE=" set title \"$TITLE\\\n\\\n{/*0.6 "$1"}\" font $DEFAULT_TITLE_FONT" - fi - FILETYPE="$2" - YAXIS="set ylabel \"$3\" font $DEFAULT_AXIS_LABEL_FONT" - SCALE=$4 - - echo "Title: $PLOT_TITLE" - echo "File type: $FILETYPE" - echo "yaxis: $YAXIS" - - i=0 - - for x in *_"$FILETYPE".log - do - i=$((i+1)) - PT=$(echo $x | sed s/_"$FILETYPE".log//g) - if [ ! -z "$PLOT_LINE" ] - then - PLOT_LINE=$PLOT_LINE", " - fi - - DEPTH=$(echo $PT | cut -d "-" -f 4) - PLOT_LINE=$PLOT_LINE"'$x' using (\$1/1000):(\$2/$SCALE) title \"Queue depth $DEPTH\" with lines ls $i" - - done - - OUTPUT="set output \"$TITLE-$FILETYPE.svg\" " - - echo " $PLOT_TITLE ; $YAXIS ; $DEFAULT_OPTS ; show style lines ; $OUTPUT ; plot " $PLOT_LINE | $GNUPLOT - - unset PLOT_LINE -} - -# -# plot -# - -plot "I/O Latency" lat "Time (msec)" 1000 -plot "I/O Operations Per Second" iops "IOPS" 1 -plot "I/O Submission Latency" slat "Time (μsec)" 1 -plot "I/O Completion Latency" clat "Time (msec)" 1000 -plot "I/O Bandwidth" bw "Throughput (KB/s)" 1 - - diff --git a/fio_generate_plots.1 b/fio_generate_plots.1 deleted file mode 100644 index 9e3c1ff9..00000000 --- a/fio_generate_plots.1 +++ /dev/null @@ -1,45 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH FIO_GENERATE_PLOTS 1 "May 19, 2009" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -fio_generate_plots \- Generate plots for Flexible I/O Tester -.SH SYNOPSIS -.B fio_generate_plots -.RI " title" -.br -.SH DESCRIPTION -This manual page documents briefly the -.B fio_generate_plots -command. This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBfio_generate_plots\fP is a shell script that uses gnuplot to -generate plots from fio run with \-\-latency-log (\-l) and/or -\-\-bandwidth-log (\-w). It expects the log files that fio -generated in the current directory. -.SH OPTIONS -The script takes the title of the plot as only argument. It does -not offer any additional options. -.SH AUTHOR -fio_generate_plots was written by Jens Axboe , -now Jens Axboe . -.PP -This manual page was written by Martin Steigerwald , -for the Debian project (but may be used by others). diff --git a/tools/fio_generate_plots b/tools/fio_generate_plots new file mode 100755 index 00000000..f65a326c --- /dev/null +++ b/tools/fio_generate_plots @@ -0,0 +1,126 @@ +#!/bin/sh +# +# This script is an almost total rewrite by Louwrentius +# of the original fio_generate_plots script provided as part of the FIO storage +# benchmark utiliy. I only retained how GNUplot is used to generate graphs, as +# that is something I know nothing about. +# +# The script uses the files generated by FIO to create nice graphs in the +# SVG format. This output format is supported by most modern browsers and +# allows resolution independant graphs to be generated. +# +# This script supports GNUPLOT 4.4 and higher. +# +# Version 1.0 @ 20121231 +# +# +# + +if [ -z "$1" ]; then + echo "Usage: fio_generate_plots subtitle [xres yres]" + exit 1 +fi + +GNUPLOT=$(which gnuplot) +if [ ! -x $GNUPLOT ] +then + echo You need gnuplot installed to generate graphs + exit 1 +fi + +TITLE="$1" + +# set resolution +if [ ! -z "$2" ] && [ ! -z "$3" ] +then + XRES="$2" + YRES="$3" +else + XRES=1280 + YRES=768 +fi + +if [ -z "$SAMPLE_DURATION" ] +then + SAMPLE_DURATION="*" +fi + +DEFAULT_GRID_LINE_TYPE=3 +DEFAULT_LINE_WIDTH=2 +DEFAULT_LINE_COLORS=" +set object 1 rectangle from screen 0,0 to screen 1,1 fillcolor rgb\"#ffffff\" behind +set style line 1 lc rgb \"#E41A1C\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 2 lc rgb \"#377EB8\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 3 lc rgb \"#4DAF4A\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 4 lc rgb \"#984EA3\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 5 lc rgb \"#FF7F00\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 6 lc rgb \"#DADA33\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 7 lc rgb \"#A65628\" lw $DEFAULT_LINE_WIDTH lt 1; +set style line 20 lc rgb \"#000000\" lt $DEFAULT_GRID_LINE_TYPE lw $DEFAULT_LINE_WIDTH; +" + +DEFAULT_TERMINAL="set terminal svg enhanced dashed size $XRES,$YRES dynamic" +DEFAULT_TITLE_FONT="\"Helvetica,28\"" +DEFAULT_AXIS_FONT="\"Helvetica,14\"" +DEFAULT_AXIS_LABEL_FONT="\"Helvetica,16\"" +DEFAULT_XLABEL="set xlabel \"Time (sec)\" font $DEFAULT_AXIS_LABEL_FONT" +DEFAULT_XTIC="set xtics font $DEFAULT_AXIS_FONT" +DEFAULT_YTIC="set ytics font $DEFAULT_AXIS_FONT" +DEFAULT_MXTIC="set mxtics 0" +DEFAULT_MYTIC="set mytics 2" +DEFAULT_XRANGE="set xrange [0:$SAMPLE_DURATION]" +DEFAULT_YRANGE="set yrange [0:*]" +DEFAULT_GRID="set grid ls 20" +DEFAULT_KEY="set key outside bottom center ; set key box enhanced spacing 2.0 samplen 3 horizontal width 4 height 1.2 " +DEFAULT_SOURCE="set label 30 \"Data source: http://example.com\" font $DEFAULT_AXIS_FONT tc rgb \"#00000f\" at screen 0.976,0.175 right" +DEFAULT_OPTS="$DEFAULT_LINE_COLORS ; $DEFAULT_GRID_LINE ; $DEFAULT_GRID ; $DEFAULT_GRID_MINOR ; $DEFAULT_XLABEL ; $DEFAULT_XRANGE ; $DEFAULT_YRANGE ; $DEFAULT_XTIC ; $DEFAULT_YTIC ; $DEFAULT_MXTIC ; $DEFAULT_MYTIC ; $DEFAULT_KEY ; $DEFAULT_TERMINAL ; $DEFAULT_SOURCE" + +plot () { + + if [ -z "$TITLE" ] + then + PLOT_TITLE=" set title \"$1\" font $DEFAULT_TITLE_FONT" + else + PLOT_TITLE=" set title \"$TITLE\\\n\\\n{/*0.6 "$1"}\" font $DEFAULT_TITLE_FONT" + fi + FILETYPE="$2" + YAXIS="set ylabel \"$3\" font $DEFAULT_AXIS_LABEL_FONT" + SCALE=$4 + + echo "Title: $PLOT_TITLE" + echo "File type: $FILETYPE" + echo "yaxis: $YAXIS" + + i=0 + + for x in *_"$FILETYPE".log + do + i=$((i+1)) + PT=$(echo $x | sed s/_"$FILETYPE".log//g) + if [ ! -z "$PLOT_LINE" ] + then + PLOT_LINE=$PLOT_LINE", " + fi + + DEPTH=$(echo $PT | cut -d "-" -f 4) + PLOT_LINE=$PLOT_LINE"'$x' using (\$1/1000):(\$2/$SCALE) title \"Queue depth $DEPTH\" with lines ls $i" + + done + + OUTPUT="set output \"$TITLE-$FILETYPE.svg\" " + + echo " $PLOT_TITLE ; $YAXIS ; $DEFAULT_OPTS ; show style lines ; $OUTPUT ; plot " $PLOT_LINE | $GNUPLOT - + unset PLOT_LINE +} + +# +# plot +# + +plot "I/O Latency" lat "Time (msec)" 1000 +plot "I/O Operations Per Second" iops "IOPS" 1 +plot "I/O Submission Latency" slat "Time (μsec)" 1 +plot "I/O Completion Latency" clat "Time (msec)" 1000 +plot "I/O Bandwidth" bw "Throughput (KB/s)" 1 + + diff --git a/tools/fio_generate_plots.1 b/tools/fio_generate_plots.1 new file mode 100644 index 00000000..9e3c1ff9 --- /dev/null +++ b/tools/fio_generate_plots.1 @@ -0,0 +1,45 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH FIO_GENERATE_PLOTS 1 "May 19, 2009" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +fio_generate_plots \- Generate plots for Flexible I/O Tester +.SH SYNOPSIS +.B fio_generate_plots +.RI " title" +.br +.SH DESCRIPTION +This manual page documents briefly the +.B fio_generate_plots +command. This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBfio_generate_plots\fP is a shell script that uses gnuplot to +generate plots from fio run with \-\-latency-log (\-l) and/or +\-\-bandwidth-log (\-w). It expects the log files that fio +generated in the current directory. +.SH OPTIONS +The script takes the title of the plot as only argument. It does +not offer any additional options. +.SH AUTHOR +fio_generate_plots was written by Jens Axboe , +now Jens Axboe . +.PP +This manual page was written by Martin Steigerwald , +for the Debian project (but may be used by others).