Add support for giving bw/clat/slat log prefixes

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index dbb9ef65502c0e136785d22902099719e8304173..5a87ae4b000fe377ad9970fa7971f725c287c020 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -107,7 +107,7 @@ static void status_timer_arm(void)
        setitimer(ITIMER_REAL, &itimer, NULL);
 }
 
-static void sig_alrm(int sig)
+static void sig_alrm(int fio_unused sig)
 {
        if (threads) {
                update_io_ticks();
@@ -116,6 +116,13 @@ static void sig_alrm(int sig)
        }
 }
 
+/*
+ * Happens on thread runs with ctrl-c, ignore our own SIGQUIT
+ */
+static void sig_quit(int sig)
+{
+}
+
 static void sig_int(int sig)
 {
        if (threads) {
@@ -125,7 +132,7 @@ static void sig_int(int sig)
        }
 }
 
-static void sig_ill(int sig)
+static void sig_ill(int fio_unused sig)
 {
        if (!threads)
                return;
@@ -154,6 +161,22 @@ static void set_sig_handlers(void)
        act.sa_handler = sig_ill;
        act.sa_flags = SA_RESTART;
        sigaction(SIGILL, &act, NULL);
+
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = sig_quit;
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGQUIT, &act, NULL);
+}
+
+static inline int should_check_rate(struct thread_data *td)
+{
+       /*
+        * No minimum rate set, always ok
+        */
+       if (!td->o.ratemin && !td->o.rate_iops_min)
+               return 0;
+
+       return 1;
 }
 
 /*
@@ -166,12 +189,6 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
        unsigned long spent;
        unsigned long rate;
 
-       /*
-        * No minimum rate set, always ok
-        */
-       if (!td->o.ratemin && !td->o.rate_iops_min)
-               return 0;
-
        /*
         * allow a 2 second settle period in the beginning
         */
@@ -340,6 +357,12 @@ requeue:
        return 0;
 }
 
+static inline void update_tv_cache(struct thread_data *td)
+{
+       if ((++td->tv_cache_nr & td->tv_cache_mask) == td->tv_cache_mask)
+               fio_gettime(&td->tv_cache, NULL);
+}
+
 /*
  * The main verify engine. Runs over the writes we previously submitted,
  * reads the blocks back in, and checks the crc/md5 of the data.
@@ -377,7 +400,9 @@ static void do_verify(struct thread_data *td)
                if (!io_u)
                        break;
 
-               if (runtime_exceeded(td, &io_u->start_time)) {
+               update_tv_cache(td);
+
+               if (runtime_exceeded(td, &td->tv_cache)) {
                        put_io_u(td, io_u);
                        td->terminate = 1;
                        break;
@@ -490,7 +515,6 @@ sync_done:
  */
 static void do_io(struct thread_data *td)
 {
-       struct timeval s;
        unsigned long usec;
        unsigned int i;
        int ret = 0;
@@ -514,9 +538,9 @@ static void do_io(struct thread_data *td)
                if (!io_u)
                        break;
 
-               memcpy(&s, &io_u->start_time, sizeof(s));
+               update_tv_cache(td);
 
-               if (runtime_exceeded(td, &s)) {
+               if (runtime_exceeded(td, &td->tv_cache)) {
                        put_io_u(td, io_u);
                        td->terminate = 1;
                        break;
@@ -564,7 +588,9 @@ static void do_io(struct thread_data *td)
                                requeue_io_u(td, &io_u);
                        } else {
 sync_done:
-                               fio_gettime(&comp_time, NULL);
+                               if (should_check_rate(td))
+                                       fio_gettime(&comp_time, NULL);
+
                                bytes_done = io_u_sync_complete(td, io_u);
                                if (bytes_done < 0)
                                        ret = bytes_done;
@@ -603,7 +629,8 @@ sync_done:
                        if (full && !min_evts)
                                min_evts = 1;
 
-                       fio_gettime(&comp_time, NULL);
+                       if (should_check_rate(td))
+                               fio_gettime(&comp_time, NULL);
 
                        do {
                                ret = io_u_queued_complete(td, min_evts);
@@ -624,8 +651,8 @@ sync_done:
                 * of completions except the very first one which may look
                 * a little bursty
                 */
-               if (!in_ramp_time(td)) {
-                       usec = utime_since(&s, &comp_time);
+               if (!in_ramp_time(td) && should_check_rate(td)) {
+                       usec = utime_since(&td->tv_cache, &comp_time);
 
                        rate_throttle(td, usec, bytes_done);
 
@@ -750,8 +777,6 @@ static int init_io_u(struct thread_data *td)
                flist_add(&io_u->list, &td->io_u_freelist);
        }
 
-       io_u_init_timeout();
-
        return 0;
 }
 
@@ -972,7 +997,6 @@ static void *thread_main(void *data)
        }
 
        fio_gettime(&td->epoch, NULL);
-       memcpy(&td->timeout_end, &td->epoch, sizeof(td->epoch));
        getrusage(RUSAGE_SELF, &td->ts.ru_start);
 
        runtime[0] = runtime[1] = 0;
@@ -980,6 +1004,7 @@ static void *thread_main(void *data)
        while (keep_running(td)) {
                fio_gettime(&td->start, NULL);
                memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start));
+               memcpy(&td->tv_cache, &td->start, sizeof(td->start));
 
                if (td->o.ratemin)
                        memcpy(&td->lastrate, &td->ts.stat_sample_time,
@@ -1041,12 +1066,24 @@ static void *thread_main(void *data)
        td->ts.io_bytes[0] = td->io_bytes[0];
        td->ts.io_bytes[1] = td->io_bytes[1];
 
-       if (td->ts.bw_log)
-               finish_log(td, td->ts.bw_log, "bw");
-       if (td->ts.slat_log)
-               finish_log(td, td->ts.slat_log, "slat");
-       if (td->ts.clat_log)
-               finish_log(td, td->ts.clat_log, "clat");
+       if (td->ts.bw_log) {
+               if (td->o.bw_log_file)
+                       finish_log_named(td, td->ts.bw_log, td->o.bw_log_file, "bw");
+               else
+                       finish_log(td, td->ts.bw_log, "bw");
+       }
+       if (td->ts.slat_log) {
+               if (td->o.lat_log_file)
+                       finish_log_named(td, td->ts.slat_log, td->o.lat_log_file, "clat");
+               else
+                       finish_log(td, td->ts.slat_log, "slat");
+       }
+       if (td->ts.clat_log) {
+               if (td->o.lat_log_file)
+                       finish_log_named(td, td->ts.clat_log, td->o.lat_log_file, "clat");
+               else
+                       finish_log(td, td->ts.clat_log, "clat");
+       }
        if (td->o.exec_postrun) {
                if (system(td->o.exec_postrun) < 0)
                        log_err("fio: postrun %s failed\n", td->o.exec_postrun);