Some more bits of blktrace support

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index d85f956f7c552a7e78b5fc18fdec1e6f9a17f372..75b448d5e56ad684dd561a54b8b0fc033cb1d4c5 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -70,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;
@@ -308,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;
                }
 
@@ -438,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;
                }
 
@@ -640,6 +645,8 @@ static int init_io_u(struct thread_data *td)
 
        p = ALIGN(td->orig_buffer);
        for (i = 0; i < max_units; i++) {
+               if (td->terminate)
+                       return 1;
                io_u = malloc(sizeof(*io_u));
                memset(io_u, 0, sizeof(*io_u));
                INIT_LIST_HEAD(&io_u->list);
@@ -765,41 +772,41 @@ static void *thread_main(void *data)
        INIT_LIST_HEAD(&td->io_hist_list);
        td->io_hist_tree = RB_ROOT;
 
+       td_set_runstate(td, TD_INITIALIZED);
+       fio_sem_up(startup_sem);
+       fio_sem_down(td->mutex);
+
+       /*
+        * the ->mutex semaphore is now no longer used, close it to avoid
+        * eating a file descriptor
+        */
+       fio_sem_remove(td->mutex);
+
        if (init_io_u(td))
-               goto err_sem;
+               goto err;
 
        if (fio_setaffinity(td) == -1) {
                td_verror(td, errno, "cpu_set_affinity");
-               goto err_sem;
+               goto err;
        }
 
        if (init_iolog(td))
-               goto err_sem;
+               goto err;
 
        if (td->ioprio) {
                if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
                        td_verror(td, errno, "ioprio_set");
-                       goto err_sem;
+                       goto err;
                }
        }
 
        if (nice(td->o.nice) == -1) {
                td_verror(td, errno, "nice");
-               goto err_sem;
+               goto err;
        }
 
        if (td->o.ioscheduler && switch_ioscheduler(td))
-               goto err_sem;
-
-       td_set_runstate(td, TD_INITIALIZED);
-       fio_sem_up(startup_sem);
-       fio_sem_down(td->mutex);
-
-       /*
-        * the ->mutex semaphore is now no longer used, close it to avoid
-        * eating a file descriptor
-        */
-       fio_sem_remove(td->mutex);
+               goto err;
 
        if (!td->o.create_serialize && setup_files(td))
                goto err;
@@ -824,7 +831,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));
 
@@ -908,9 +915,6 @@ err:
        options_mem_free(td);
        td_set_runstate(td, TD_EXITED);
        return (void *) (unsigned long) td->error;
-err_sem:
-       fio_sem_up(startup_sem);
-       goto err;
 }
 
 /*