[PATCH] Fixup client error exit

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 0b0a5e8e540851e032e0004e23175b7cfcd798e3..e8a86585d4bd5d4ee83cff9202eca1ef8a3a58a9 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -26,12 +26,11 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
-#include <assert.h>
+#include <locale.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include <sys/ioctl.h>
 #include <sys/mman.h>
 
 #include "fio.h"
@@ -48,6 +47,7 @@ int temp_stall_ts;
 
 static volatile int startup_sem;
 static volatile int fio_abort;
+static int exit_value;
 
 struct io_log *agg_io_log[2];
 
@@ -383,7 +383,7 @@ static void do_io(struct thread_data *td)
 
        td_set_runstate(td, TD_RUNNING);
 
-       while (td->this_io_bytes[td->ddir] < td->io_size) {
+       while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->io_size) {
                struct timespec *timeout;
                int min_evts = 0;
                struct io_u *io_u;
@@ -400,7 +400,6 @@ static void do_io(struct thread_data *td)
                        break;
 
                memcpy(&s, &io_u->start_time, sizeof(s));
-
 requeue:
                ret = td_io_queue(td, io_u);
                if (ret) {
@@ -413,7 +412,6 @@ requeue:
                                io_u->xfer_buf += ret;
                                goto requeue;
                        } else {
-                               td_verror(td, io_u->error);
                                put_io_u(td, io_u);
                                break;
                        }
@@ -757,12 +755,13 @@ static void *thread_main(void *data)
                terminate_threads(td->groupid, 0);
 
 err:
+       if (td->error)
+               printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
        close_files(td);
        close_ioengine(td);
        cleanup_io_u(td);
        td_set_runstate(td, TD_EXITED);
        return NULL;
-
 }
 
 /*
@@ -813,6 +812,9 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
                        continue;
                }
 
+               if (td->error)
+                       exit_value++;
+
                td_set_runstate(td, TD_REAPED);
 
                if (td->use_thread) {
@@ -871,6 +873,9 @@ static void run_threads(void)
                 * client data interspersed on disk
                 */
                if (setup_files(td)) {
+                       exit_value++;
+                       if (td->error)
+                               log_err("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
                        td_set_runstate(td, TD_REAPED);
                        todo--;
                }
@@ -1007,6 +1012,13 @@ int main(int argc, char *argv[])
 {
        long ps;
 
+       /*
+        * We need locale for number printing, if it isn't set then just
+        * go with the US format.
+        */
+       if (!getenv("LC_NUMERIC"))
+               setlocale(LC_NUMERIC, "en_US");
+
        if (parse_options(argc, argv))
                return 1;
 
@@ -1040,5 +1052,5 @@ int main(int argc, char *argv[])
                }
        }
 
-       return 0;
+       return exit_value;
 }