Fix read_iolog

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 4d225f84b409a7efde36394e05dd296157ad851b..d8c143332823bf2c488ef0799951c8ce70c71fe3 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -35,6 +35,7 @@
 #include <sys/mman.h>
 
 #include "fio.h"
+#include "hash.h"
 
 unsigned long page_mask;
 unsigned long page_size;
@@ -69,7 +70,10 @@ static void terminate_threads(int group_id)
 
        for_each_td(td, i) {
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
-                       if (td->runstate <= TD_RUNNING)
+                       /*
+                        * if the thread is running, just let it exit
+                        */
+                       if (td->runstate < TD_RUNNING)
                                kill(td->pid, SIGQUIT);
                        td->terminate = 1;
                        td->o.start_delay = 0;
@@ -307,6 +311,7 @@ static void do_verify(struct thread_data *td)
 
                if (runtime_exceeded(td, &io_u->start_time)) {
                        put_io_u(td, io_u);
+                       td->terminate = 1;
                        break;
                }
 
@@ -437,6 +442,7 @@ static void do_io(struct thread_data *td)
 
                if (runtime_exceeded(td, &s)) {
                        put_io_u(td, io_u);
+                       td->terminate = 1;
                        break;
                }
 
@@ -595,11 +601,11 @@ static void cleanup_io_u(struct thread_data *td)
  */
 static void fill_io_buf(struct thread_data *td, struct io_u *io_u, int max_bs)
 {
-       int *ptr = io_u->buf;
+       long *ptr = io_u->buf;
 
        if (!td->o.zero_buffers) {
                while ((void *) ptr - io_u->buf < max_bs) {
-                       *ptr = rand() * 0x9e370001;
+                       *ptr = rand() * GOLDEN_RATIO_PRIME;
                        ptr++;
                }
        } else
@@ -823,7 +829,7 @@ static void *thread_main(void *data)
 
        runtime[0] = runtime[1] = 0;
        clear_state = 0;
-       while (td->o.loops--) {
+       while (td->o.time_based || td->o.loops--) {
                fio_gettime(&td->start, NULL);
                memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start));