[PATCH] Add fio_assert()

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index bce13a72306fccc62d84020ee4d57a3a2d8d8722..ace8c5ee09aae9e4353d9879273eaadbe1c2848d 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"
@@ -82,11 +81,6 @@ static void sig_handler(int sig)
                        disk_util_timer_arm();
                        print_thread_status();
                        break;
-               case SIGSEGV:
-                       fprintf(stderr, "fio: got segfault, aborting\n");
-                       terminate_threads(TERMINATE_ALL, 1);
-                       fio_abort = 1;
-                       exit(0);
                default:
                        printf("\nfio: terminating on signal %d\n", sig);
                        fflush(stdout);
@@ -388,7 +382,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;
@@ -406,11 +400,21 @@ static void do_io(struct thread_data *td)
 
                memcpy(&s, &io_u->start_time, sizeof(s));
 
+requeue:
                ret = td_io_queue(td, io_u);
                if (ret) {
-                       td_verror(td, io_u->error);
-                       put_io_u(td, io_u);
-                       break;
+                       if (ret > 0 && (io_u->xfer_buflen != io_u->resid) &&
+                           io_u->resid) {
+                               /*
+                                * short read/write. requeue.
+                                */
+                               io_u->xfer_buflen = io_u->resid;
+                               io_u->xfer_buf += ret;
+                               goto requeue;
+                       } else {
+                               put_io_u(td, io_u);
+                               break;
+                       }
                }
 
                add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
@@ -684,8 +688,10 @@ static void *thread_main(void *data)
        if (td_io_init(td))
                goto err;
 
-       if (td->exec_prerun)
-               system(td->exec_prerun);
+       if (td->exec_prerun) {
+               if (system(td->exec_prerun) < 0)
+                       goto err;
+       }
 
        fio_gettime(&td->epoch, NULL);
        getrusage(RUSAGE_SELF, &td->ru_start);
@@ -740,8 +746,10 @@ static void *thread_main(void *data)
                finish_log(td, td->clat_log, "clat");
        if (td->write_iolog_file)
                write_iolog_close(td);
-       if (td->exec_postrun)
-               system(td->exec_postrun);
+       if (td->exec_postrun) {
+               if (system(td->exec_postrun) < 0)
+                       log_err("fio: postrun %s failed\n", td->exec_postrun);
+       }
 
        if (exitall_on_terminate)
                terminate_threads(td->groupid, 0);
@@ -997,6 +1005,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;