[PATCH] Add 'description' option

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index ca589233354b3c970b55a8711f1833a7e5d3fefa..7ddde7d18561393c692e44a6cc6f6b09e942b3e5 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -47,11 +47,19 @@ int shm_id = 0;
 int temp_stall_ts;
 
 static volatile int startup_sem;
+static volatile int fio_abort;
+
+struct io_log *agg_io_log[2];
 
 #define TERMINATE_ALL          (-1)
 #define JOB_START_TIMEOUT      (5 * 1000)
 
-static void terminate_threads(int group_id)
+static inline void td_set_runstate(struct thread_data *td, int runstate)
+{
+       td->runstate = runstate;
+}
+
+static void terminate_threads(int group_id, int forced_kill)
 {
        struct thread_data *td;
        int i;
@@ -60,6 +68,8 @@ static void terminate_threads(int group_id)
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
                        td->terminate = 1;
                        td->start_delay = 0;
+                       if (forced_kill)
+                               td_set_runstate(td, TD_EXITED);
                }
        }
 }
@@ -72,10 +82,15 @@ 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\n");
+                       printf("\nfio: terminating on signal %d\n", sig);
                        fflush(stdout);
-                       terminate_threads(TERMINATE_ALL);
+                       terminate_threads(TERMINATE_ALL, 0);
                        break;
        }
 }
@@ -125,11 +140,6 @@ static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
        return 0;
 }
 
-static inline void td_set_runstate(struct thread_data *td, int runstate)
-{
-       td->runstate = runstate;
-}
-
 static struct fio_file *get_next_file(struct thread_data *td)
 {
        unsigned int old_next_file = td->next_file;
@@ -440,8 +450,8 @@ static void do_io(struct thread_data *td)
 
                if (check_min_rate(td, &icd.time)) {
                        if (exitall_on_terminate)
-                               terminate_threads(td->groupid);
-                       td_verror(td, ENOMEM);
+                               terminate_threads(td->groupid, 0);
+                       td_verror(td, ENODATA);
                        break;
                }
 
@@ -637,9 +647,6 @@ static void *thread_main(void *data)
                goto err;
        }
 
-       if (td_io_init(td))
-               goto err;
-
        if (init_iolog(td))
                goto err;
 
@@ -670,6 +677,13 @@ static void *thread_main(void *data)
        if (open_files(td))
                goto err;
 
+       /*
+        * Do this late, as some IO engines would like to have the
+        * files setup prior to initializing structures.
+        */
+       if (td_io_init(td))
+               goto err;
+
        if (td->exec_prerun)
                system(td->exec_prerun);
 
@@ -730,7 +744,7 @@ static void *thread_main(void *data)
                system(td->exec_postrun);
 
        if (exitall_on_terminate)
-               terminate_threads(td->groupid);
+               terminate_threads(td->groupid, 0);
 
 err:
        close_files(td);
@@ -805,7 +819,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
        }
 
        if (*nr_running == cputhreads && !pending)
-               terminate_threads(TERMINATE_ALL);
+               terminate_threads(TERMINATE_ALL, 0);
 }
 
 /*
@@ -827,6 +841,7 @@ static void run_threads(void)
 
        signal(SIGINT, sig_handler);
        signal(SIGALRM, sig_handler);
+       signal(SIGSEGV, sig_handler);
 
        todo = thread_number;
        nr_running = 0;
@@ -915,7 +930,7 @@ static void run_threads(void)
                 */
                fio_gettime(&this_start, NULL);
                left = this_jobs;
-               while (left) {
+               while (left && !fio_abort) {
                        if (mtime_since_now(&this_start) > JOB_START_TIMEOUT)
                                break;
 
@@ -989,10 +1004,22 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       if (write_bw_log) {
+               setup_log(&agg_io_log[DDIR_READ]);
+               setup_log(&agg_io_log[DDIR_WRITE]);
+       }
+
        disk_util_timer_arm();
 
        run_threads();
-       show_run_stats();
+
+       if (!fio_abort) {
+               show_run_stats();
+               if (write_bw_log) {
+                       __finish_log(agg_io_log[DDIR_READ],"agg-read_bw.log");
+                       __finish_log(agg_io_log[DDIR_WRITE],"agg-write_bw.log");
+               }
+       }
 
        return 0;
 }