Fix typo on continue_on_error patch
authorJens Axboe <jens.axboe@oracle.com>
Mon, 15 Jun 2009 10:37:30 +0000 (12:37 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 15 Jun 2009 10:37:30 +0000 (12:37 +0200)
Also expand the error print a bit.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
fio.c
fio.h
stat.c

diff --git a/fio.c b/fio.c
index e1da2c9..bb26062 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -379,8 +379,8 @@ static int break_on_this_error(struct thread_data *td, int *retptr)
        if (ret < 0 || td->error) {
                int err;
 
-               if (!td->o.continue_on_error);
-                       return 0;
+               if (!td->o.continue_on_error)
+                       return 1;
 
                if (ret < 0)
                        err = -ret;
diff --git a/fio.h b/fio.h
index 477b19a..7c059d1 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -446,7 +446,7 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 
 #define MAX_JOBS       (1024)
 
-#define td_non_fatal_error(e)  ((e) == -EIO || (e) == EILSEQ)
+#define td_non_fatal_error(e)  ((e) == EIO || (e) == EILSEQ)
 
 static inline void update_error_count(struct thread_data *td, int err)
 {
diff --git a/stat.c b/stat.c
index ec87deb..e1af59e 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -336,8 +336,10 @@ static void show_thread_status(struct thread_stat *ts,
        stat_calc_lat_m(ts, io_u_lat_m);
        show_latencies(io_u_lat_u, io_u_lat_m);
        if (ts->continue_on_error) {
-               log_info("     errors: total=%lu, first_error=%d\n",
-                                       ts->total_err_count, ts->first_error);
+               log_info("     errors    : total=%lu, first_error=%d/<%s>\n",
+                                       ts->total_err_count,
+                                       ts->first_error,
+                                       strerror(ts->first_error));
        }
 }