Remove debug/broken assert() in the IOPS logging code

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 2400cd70f04c49a5d2ba74e3d6fa590c5ae2e65c..851cc2c0ccf7188da3755e80deeaf8b95e34d83d 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1128,6 +1128,9 @@ static void __add_log_sample(struct io_log *iolog, unsigned long val,
 {
        const int nr_samples = iolog->nr_samples;
 
+       if (!iolog->nr_samples)
+               iolog->avg_last = t;
+
        if (iolog->nr_samples == iolog->max_samples) {
                int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
 
@@ -1142,14 +1145,66 @@ static void __add_log_sample(struct io_log *iolog, unsigned long val,
        iolog->nr_samples++;
 }
 
+static inline void reset_io_stat(struct io_stat *ios)
+{
+       ios->max_val = ios->min_val = ios->samples = 0;
+       ios->mean.u.f = ios->S.u.f = 0;
+}
+
 static void add_log_sample(struct thread_data *td, struct io_log *iolog,
                           unsigned long val, enum fio_ddir ddir,
                           unsigned int bs)
 {
+       unsigned long elapsed, this_window;
+
        if (!ddir_rw(ddir))
                return;
 
-       __add_log_sample(iolog, val, ddir, bs, mtime_since_now(&td->epoch));
+       elapsed = mtime_since_now(&td->epoch);
+
+       /*
+        * If no time averaging, just add the log sample.
+        */
+       if (!iolog->avg_msec) {
+               __add_log_sample(iolog, val, ddir, bs, elapsed);
+               return;
+       }
+
+       /*
+        * Add the sample. If the time period has passed, then
+        * add that entry to the log and clear.
+        */
+       add_stat_sample(&iolog->avg_window[ddir], val);
+
+       /*
+        * If period hasn't passed, adding the above sample is all we
+        * need to do.
+        */
+       this_window = elapsed - iolog->avg_last;
+       if (this_window < iolog->avg_msec)
+               return;
+
+       /*
+        * Note an entry in the log. Use the mean from the logged samples,
+        * making sure to properly round up. Only write a log entry if we
+        * had actual samples done.
+        */
+       if (iolog->avg_window[DDIR_READ].samples) {
+               unsigned long mr;
+
+               mr = iolog->avg_window[DDIR_READ].mean.u.f + 0.50;
+               __add_log_sample(iolog, mr, DDIR_READ, 0, elapsed);
+       }
+       if (iolog->avg_window[DDIR_WRITE].samples) {
+               unsigned long mw;
+
+               mw = iolog->avg_window[DDIR_WRITE].mean.u.f + 0.50;
+               __add_log_sample(iolog, mw, DDIR_WRITE, 0, elapsed);
+       }
+
+       reset_io_stat(&iolog->avg_window[DDIR_READ]);
+       reset_io_stat(&iolog->avg_window[DDIR_WRITE]);
+       iolog->avg_last = elapsed;
 }
 
 void add_agg_sample(unsigned long val, enum fio_ddir ddir, unsigned int bs)
@@ -1258,10 +1313,8 @@ void add_iops_sample(struct thread_data *td, enum fio_ddir ddir,
 
        add_stat_sample(&ts->iops_stat[ddir], iops);
 
-       if (td->iops_log) {
-               assert(iops);
+       if (td->iops_log)
                add_log_sample(td, td->iops_log, iops, ddir, 0);
-       }
 
        fio_gettime(&td->iops_sample_time, NULL);
        td->stat_io_blocks[ddir] = td->this_io_blocks[ddir];