iolog: switch to list based scheme
[fio.git] / stat.c
diff --git a/stat.c b/stat.c
index 8c41914446ce610f4dcfb6d67ae4535ebf6255c0..b42e886c32aeff16aca4ca3892509b192e1aa021 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -15,6 +15,7 @@
 #include "idletime.h"
 #include "lib/pow2.h"
 #include "lib/output_buffer.h"
+#include "helper_thread.h"
 
 struct fio_mutex *stat_mutex;
 
@@ -1848,66 +1849,124 @@ static inline void add_stat_sample(struct io_stat *is, unsigned long data)
        is->samples++;
 }
 
+/*
+ * Return a struct io_logs, which is added to the tail of the log
+ * list for 'iolog'.
+ */
+static struct io_logs *get_new_log(struct io_log *iolog)
+{
+       size_t new_size, new_samples;
+       struct io_logs *cur_log;
+
+       /*
+        * Cap the size at MAX_LOG_ENTRIES, so we don't keep doubling
+        * forever
+        */
+       if (!iolog->cur_log_max)
+               new_samples = DEF_LOG_ENTRIES;
+       else {
+               new_samples = iolog->cur_log_max * 2;
+               if (new_samples > MAX_LOG_ENTRIES)
+                       new_samples = MAX_LOG_ENTRIES;
+       }
+
+       /*
+        * If the alloc size is sufficiently large, quiesce pending IO before
+        * attempting it. This is to avoid spending a long time in alloc with
+        * IO pending, which will unfairly skew the completion latencies of
+        * inflight IO.
+        */
+       new_size = new_samples * log_entry_sz(iolog);
+       if (new_size >= LOG_QUIESCE_SZ)
+               io_u_quiesce(iolog->td);
+
+       cur_log = malloc(sizeof(*cur_log));
+       if (cur_log) {
+               INIT_FLIST_HEAD(&cur_log->list);
+               cur_log->log = malloc(new_size);
+               if (cur_log->log) {
+                       cur_log->nr_samples = 0;
+                       cur_log->max_samples = new_samples;
+                       flist_add_tail(&cur_log->list, &iolog->io_logs);
+                       iolog->cur_log_max = new_samples;
+                       return cur_log;
+               }
+               free(cur_log);
+       }
+
+       return NULL;
+}
+
+static struct io_logs *get_cur_log(struct io_log *iolog)
+{
+       struct io_logs *cur_log;
+
+       cur_log = iolog_cur_log(iolog);
+       if (!cur_log) {
+               cur_log = get_new_log(iolog);
+               if (!cur_log)
+                       return NULL;
+       }
+
+       if (cur_log->nr_samples < cur_log->max_samples)
+               return cur_log;
+
+       /*
+        * No room for a new sample. If we're compressing on the fly, flush
+        * out the current chunk
+        */
+       if (iolog->log_gz) {
+               if (iolog_cur_flush(iolog, cur_log)) {
+                       log_err("fio: failed flushing iolog! Will stop logging.\n");
+                       return NULL;
+               }
+       }
+
+       /*
+        * Get a new log array, and add to our list
+        */
+       cur_log = get_new_log(iolog);
+       if (!cur_log) {
+               log_err("fio: failed extending iolog! Will stop logging.\n");
+               return NULL;
+       }
+
+       return cur_log;
+}
+
 static void __add_log_sample(struct io_log *iolog, unsigned long val,
                             enum fio_ddir ddir, unsigned int bs,
                             unsigned long t, uint64_t offset)
 {
-       uint64_t nr_samples = iolog->nr_samples;
-       struct io_sample *s;
+       struct io_logs *cur_log;
 
        if (iolog->disabled)
                return;
-
-       if (!iolog->nr_samples)
+       if (flist_empty(&iolog->io_logs))
                iolog->avg_last = t;
 
-       if (iolog->nr_samples == iolog->max_samples) {
-               size_t new_size, new_samples;
-               void *new_log;
+       cur_log = get_cur_log(iolog);
+       if (cur_log) {
+               struct io_sample *s;
 
-               if (!iolog->max_samples)
-                       new_samples = DEF_LOG_ENTRIES;
-               else
-                       new_samples = iolog->max_samples * 2;
-
-               new_size = new_samples * log_entry_sz(iolog);
-
-               if (iolog->log_gz && (new_size > iolog->log_gz)) {
-                       if (!iolog->log) {
-                               iolog->log = malloc(new_size);
-                               iolog->max_samples = new_samples;
-                       } else if (iolog_flush(iolog, 0)) {
-                               log_err("fio: failed flushing iolog! Will stop logging.\n");
-                               iolog->disabled = 1;
-                               return;
-                       }
-                       nr_samples = iolog->nr_samples;
-               } else {
-                       new_log = realloc(iolog->log, new_size);
-                       if (!new_log) {
-                               log_err("fio: failed extending iolog! Will stop logging.\n");
-                               iolog->disabled = 1;
-                               return;
-                       }
-                       iolog->log = new_log;
-                       iolog->max_samples = new_samples;
-               }
-       }
+               s = get_sample(iolog, cur_log, cur_log->nr_samples);
 
-       s = get_sample(iolog, nr_samples);
+               s->val = val;
+               s->time = t;
+               io_sample_set_ddir(iolog, s, ddir);
+               s->bs = bs;
 
-       s->val = val;
-       s->time = t;
-       io_sample_set_ddir(iolog, s, ddir);
-       s->bs = bs;
+               if (iolog->log_offset) {
+                       struct io_sample_offset *so = (void *) s;
 
-       if (iolog->log_offset) {
-               struct io_sample_offset *so = (void *) s;
+                       so->offset = offset;
+               }
 
-               so->offset = offset;
+               cur_log->nr_samples++;
+               return;
        }
 
-       iolog->nr_samples++;
+       iolog->disabled = true;
 }
 
 static inline void reset_io_stat(struct io_stat *ios)
@@ -2168,8 +2227,14 @@ static int add_bw_samples(struct thread_data *td, struct timeval *t)
 
                add_stat_sample(&ts->bw_stat[ddir], rate);
 
-               if (td->bw_log)
-                       add_log_sample(td, td->bw_log, rate, ddir, 0, 0);
+               if (td->bw_log) {
+                       unsigned int bs = 0;
+
+                       if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
+                               bs = td->o.min_bs[ddir];
+
+                       add_log_sample(td, td->bw_log, rate, ddir, bs, 0);
+               }
 
                td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
        }
@@ -2233,8 +2298,14 @@ static int add_iops_samples(struct thread_data *td, struct timeval *t)
 
                add_stat_sample(&ts->iops_stat[ddir], iops);
 
-               if (td->iops_log)
-                       add_log_sample(td, td->iops_log, iops, ddir, 0, 0);
+               if (td->iops_log) {
+                       unsigned int bs = 0;
+
+                       if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
+                               bs = td->o.min_bs[ddir];
+
+                       add_log_sample(td, td->iops_log, iops, ddir, bs, 0);
+               }
 
                td->stat_io_blocks[ddir] = td->this_io_blocks[ddir];
        }
@@ -2246,7 +2317,6 @@ static int add_iops_samples(struct thread_data *td, struct timeval *t)
        if (spent <= td->o.iops_avg_time)
                return td->o.iops_avg_time;
 
-       printf("%lu over\n", spent - td->o.iops_avg_time);
        return td->o.iops_avg_time - (1 + spent - td->o.iops_avg_time);
 }