Add gtod_reduce option

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 0d24b189fece6ee48d11e4f3bf493af271f2731e..8863fa749f13ece7342484101db132ee94d8714a 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -8,11 +8,6 @@
 #include "fio.h"
 #include "hash.h"
 
-/*
- * Change this define to play with the timeout handling
- */
-#undef FIO_USE_TIMEOUT
-
 struct io_completion_data {
        int nr;                         /* input */
 
@@ -235,7 +230,7 @@ static inline int is_power_of_2(unsigned int val)
 static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
        const int ddir = io_u->ddir;
-       unsigned int buflen = buflen; /* silence dumb gcc warning */
+       unsigned int uninitialized_var(buflen);
        unsigned int minbs, maxbs;
        long r;
 
@@ -856,7 +851,8 @@ struct io_u *get_io_u(struct thread_data *td)
 
 out:
        if (!td_io_prep(td, io_u)) {
-               fio_gettime(&io_u->start_time, NULL);
+               if (!td->o.disable_slat)
+                       fio_gettime(&io_u->start_time, NULL);
                return io_u;
        }
 err_put:
@@ -909,11 +905,18 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                td->io_bytes[idx] += bytes;
                td->this_io_bytes[idx] += bytes;
 
-               usec = utime_since(&io_u->issue_time, &icd->time);
+               if (ramp_time_over(td)) {
+                       if (!td->o.disable_clat || !td->o.disable_bw)
+                               usec = utime_since(&io_u->issue_time,
+                                                       &icd->time);
 
-               add_clat_sample(td, idx, usec);
-               add_bw_sample(td, idx, &icd->time);
-               io_u_mark_latency(td, usec);
+                       if (!td->o.disable_clat) {
+                               add_clat_sample(td, idx, usec);
+                               io_u_mark_latency(td, usec);
+                       }
+                       if (!td->o.disable_bw)
+                               add_bw_sample(td, idx, &icd->time);
+               }
 
                if (td_write(td) && idx == DDIR_WRITE &&
                    td->o.do_verify &&
@@ -933,9 +936,11 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
        }
 }
 
-static void init_icd(struct io_completion_data *icd, int nr)
+static void init_icd(struct thread_data *td, struct io_completion_data *icd,
+                    int nr)
 {
-       fio_gettime(&icd->time, NULL);
+       if (!td->o.disable_clat || !td->o.disable_bw)
+               fio_gettime(&icd->time, NULL);
 
        icd->nr = nr;
 
@@ -964,7 +969,7 @@ long io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
 {
        struct io_completion_data icd;
 
-       init_icd(&icd, 1);
+       init_icd(td, &icd, 1);
        io_completed(td, io_u, &icd);
        put_io_u(td, io_u);
 
@@ -997,7 +1002,7 @@ long io_u_queued_complete(struct thread_data *td, int min_evts)
        } else if (!ret)
                return ret;
 
-       init_icd(&icd, ret);
+       init_icd(td, &icd, ret);
        ios_completed(td, &icd);
        if (!icd.error)
                return icd.bytes_done[0] + icd.bytes_done[1];
@@ -1011,10 +1016,12 @@ long io_u_queued_complete(struct thread_data *td, int min_evts)
  */
 void io_u_queued(struct thread_data *td, struct io_u *io_u)
 {
-       unsigned long slat_time;
+       if (!td->o.disable_slat) {
+               unsigned long slat_time;
 
-       slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
-       add_slat_sample(td, io_u->ddir, slat_time);
+               slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
+               add_slat_sample(td, io_u->ddir, slat_time);
+       }
 }
 
 /*
@@ -1033,86 +1040,3 @@ void io_u_fill_buffer(struct thread_data *td, struct io_u *io_u,
        } else
                memset(ptr, 0, max_bs);
 }
-
-#ifdef FIO_USE_TIMEOUT
-void io_u_set_timeout(struct thread_data *td)
-{
-       assert(td->cur_depth);
-
-       td->timer.it_interval.tv_sec = 0;
-       td->timer.it_interval.tv_usec = 0;
-       td->timer.it_value.tv_sec = IO_U_TIMEOUT + IO_U_TIMEOUT_INC;
-       td->timer.it_value.tv_usec = 0;
-       setitimer(ITIMER_REAL, &td->timer, NULL);
-       fio_gettime(&td->timeout_end, NULL);
-}
-
-static void io_u_dump(struct io_u *io_u)
-{
-       unsigned long t_start = mtime_since_now(&io_u->start_time);
-       unsigned long t_issue = mtime_since_now(&io_u->issue_time);
-
-       log_err("io_u=%p, t_start=%lu, t_issue=%lu\n", io_u, t_start, t_issue);
-       log_err("  buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf,
-                                               io_u->xfer_buf, io_u->buflen,
-                                               io_u->xfer_buflen,
-                                               io_u->offset);
-       log_err("  ddir=%d, fname=%s\n", io_u->ddir, io_u->file->file_name);
-}
-#else
-void io_u_set_timeout(struct thread_data fio_unused *td)
-{
-}
-#endif
-
-#ifdef FIO_USE_TIMEOUT
-static void io_u_timeout_handler(int fio_unused sig)
-{
-       struct thread_data *td, *__td;
-       pid_t pid = getpid();
-       struct flist_head *entry;
-       struct io_u *io_u;
-       int i;
-
-       log_err("fio: io_u timeout\n");
-
-       /*
-        * TLS would be nice...
-        */
-       td = NULL;
-       for_each_td(__td, i) {
-               if (__td->pid == pid) {
-                       td = __td;
-                       break;
-               }
-       }
-
-       if (!td) {
-               log_err("fio: io_u timeout, can't find job\n");
-               exit(1);
-       }
-
-       if (!td->cur_depth) {
-               log_err("fio: timeout without pending work?\n");
-               return;
-       }
-
-       log_err("fio: io_u timeout: job=%s, pid=%d\n", td->o.name, td->pid);
-
-       flist_for_each(entry, &td->io_u_busylist) {
-               io_u = flist_entry(entry, struct io_u, list);
-
-               io_u_dump(io_u);
-       }
-
-       td_verror(td, ETIMEDOUT, "io_u timeout");
-       exit(1);
-}
-#endif
-
-void io_u_init_timeout(void)
-{
-#ifdef FIO_USE_TIMEOUT
-       signal(SIGALRM, io_u_timeout_handler);
-#endif
-}