Add zero_buffers option

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index edc6b495789d04e30e88ab520a9204cf37422887..4d225f84b409a7efde36394e05dd296157ad851b 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -69,10 +69,7 @@ static void terminate_threads(int group_id)
 
        for_each_td(td, i) {
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
-                       /*
-                        * if the thread is running, just let it exit
-                        */
-                       if (td->runstate < TD_RUNNING)
+                       if (td->runstate <= TD_RUNNING)
                                kill(td->pid, SIGQUIT);
                        td->terminate = 1;
                        td->o.start_delay = 0;
@@ -332,6 +329,7 @@ static void do_verify(struct thread_data *td)
                                ret = -io_u->error;
                        else if (io_u->resid) {
                                int bytes = io_u->xfer_buflen - io_u->resid;
+                               struct fio_file *f = io_u->file;
 
                                /*
                                 * zero read, fail
@@ -345,8 +343,11 @@ static void do_verify(struct thread_data *td)
                                io_u->xfer_buflen = io_u->resid;
                                io_u->xfer_buf += bytes;
                                io_u->offset += bytes;
+                               f->last_completed_pos = io_u->offset;
+
+                               td->ts.short_io_u[io_u->ddir]++;
 
-                               if (io_u->offset == io_u->file->real_file_size)
+                               if (io_u->offset == f->real_file_size)
                                        goto sync_done;
 
                                requeue_io_u(td, &io_u);
@@ -446,6 +447,7 @@ static void do_io(struct thread_data *td)
                                ret = -io_u->error;
                        else if (io_u->resid) {
                                int bytes = io_u->xfer_buflen - io_u->resid;
+                               struct fio_file *f = io_u->file;
 
                                /*
                                 * zero read, fail
@@ -459,8 +461,11 @@ static void do_io(struct thread_data *td)
                                io_u->xfer_buflen = io_u->resid;
                                io_u->xfer_buf += bytes;
                                io_u->offset += bytes;
+                               f->last_completed_pos = io_u->offset;
 
-                               if (io_u->offset == io_u->file->real_file_size)
+                               td->ts.short_io_u[io_u->ddir]++;
+
+                               if (io_u->offset == f->real_file_size)
                                        goto sync_done;
 
                                requeue_io_u(td, &io_u);
@@ -588,14 +593,17 @@ static void cleanup_io_u(struct thread_data *td)
 /*
  * "randomly" fill the buffer contents
  */
-static void fill_rand_buf(struct io_u *io_u, int max_bs)
+static void fill_io_buf(struct thread_data *td, struct io_u *io_u, int max_bs)
 {
        int *ptr = io_u->buf;
 
-       while ((void *) ptr - io_u->buf < max_bs) {
-               *ptr = rand() * 0x9e370001;
-               ptr++;
-       }
+       if (!td->o.zero_buffers) {
+               while ((void *) ptr - io_u->buf < max_bs) {
+                       *ptr = rand() * 0x9e370001;
+                       ptr++;
+               }
+       } else
+               memset(ptr, 0, max_bs);
 }
 
 static int init_io_u(struct thread_data *td)
@@ -636,8 +644,9 @@ static int init_io_u(struct thread_data *td)
                INIT_LIST_HEAD(&io_u->list);
 
                io_u->buf = p + max_bs * i;
-               if (td_write(td) || td_rw(td))
-                       fill_rand_buf(io_u, max_bs);
+
+               if (td_write(td))
+                       fill_io_buf(td, io_u, max_bs);
 
                io_u->index = i;
                io_u->flags = IO_U_F_FREE;
@@ -662,7 +671,11 @@ static int switch_ioscheduler(struct thread_data *td)
 
        f = fopen(tmp, "r+");
        if (!f) {
-               td_verror(td, errno, "fopen");
+               if (errno == ENOENT) {
+                       log_err("fio: os or kernel doesn't support IO scheduler switching\n");
+                       return 0;
+               }
+               td_verror(td, errno, "fopen iosched");
                return 1;
        }