Improve naming in fio gnuplot graphs

Use job name and strip the known postfix of files out of the title.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/fio_generate_plots b/fio_generate_plots
index 4ae1d0affe6cb52260bbe0706939112aeab70aa9..9b1e1ca59ecf7df69d38aa2769e9b84c25b5c1c5 100755 (executable)
--- a/fio_generate_plots
+++ b/fio_generate_plots
@@ -20,11 +20,12 @@ for i in *bw.log; do
        if [ ! -r $i ]; then
                continue
        fi
+       PT=$(echo $i | sed s/_bw.log//g)
        if [ "$PLOT_LINE"x != "x" ]; then
                PLOT_LINE=$PLOT_LINE", "
        fi
 
-       PLOT_LINE=$PLOT_LINE"'$i' with lines"
+       PLOT_LINE=$PLOT_LINE"'$i' title '$PT' with lines"
 done
 
 if [ "$PLOT_LINE"x != "x" ]; then
@@ -37,11 +38,12 @@ for i in *slat.log; do
        if [ ! -r $i ]; then
                continue
        fi
+       PT=$(echo $i | sed s/_slat.log//g)
        if [ "$PLOT_LINE"x != "x" ]; then
                PLOT_LINE=$PLOT_LINE", "
        fi
 
-       PLOT_LINE=$PLOT_LINE"'$i' with lines"
+       PLOT_LINE=$PLOT_LINE"'$i' title '$PT' with lines"
 done
 
 if [ "$PLOT_LINE"x != "x" ]; then
@@ -54,11 +56,12 @@ for i in *clat.log; do
        if [ ! -r $i ]; then
                continue
        fi
+       PT=$(echo $i | sed s/_clat.log//g)
        if [ "$PLOT_LINE"x != "x" ]; then
                PLOT_LINE=$PLOT_LINE", "
        fi
 
-       PLOT_LINE=$PLOT_LINE"'$i' with lines"
+       PLOT_LINE=$PLOT_LINE"'$i' title '$PT' with lines"
 done
 
 if [ "$PLOT_LINE"x != "x" ]; then

diff --git a/log.c b/log.c
index 63c0a332d6bb6680998cbfd81a186d0ff6f24a3e..082cfd410bcbe356f2451f32399b164a6de45093 100644 (file)
--- a/log.c
+++ b/log.c
@@ -484,6 +484,6 @@ void finish_log(struct thread_data *td, struct io_log *log, const char *name)
 {
        char file_name[256];
 
-       snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
+       snprintf(file_name, 200, "%s_%s.log", td->o.name, name);
        __finish_log(log, file_name);
 }