Add cache hit stats

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 331abf676c7bfae00c349208e894f7049f5f6ad5..ec75de241be623756c88c1b88edb69473a0dfb97 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -419,7 +419,7 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
        unsigned long runt;
        unsigned long long min, max, bw, iops;
        double mean, dev;
-       char *io_p, *bw_p, *bw_p_alt, *iops_p, *zbd_w_st = NULL;
+       char *io_p, *bw_p, *bw_p_alt, *iops_p, *post_st = NULL;
        int i2p;
 
        if (ddir_sync(ddir)) {
@@ -451,15 +451,25 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
        iops = (1000 * (uint64_t)ts->total_io_u[ddir]) / runt;
        iops_p = num2str(iops, ts->sig_figs, 1, 0, N2S_NONE);
        if (ddir == DDIR_WRITE)
-               zbd_w_st = zbd_write_status(ts);
+               post_st = zbd_write_status(ts);
+       else if (ddir == DDIR_READ && ts->cachehit && ts->cachemiss) {
+               uint64_t total;
+               double hit;
+
+               total = ts->cachehit + ts->cachemiss;
+               hit = (double) ts->cachehit / (double) total;
+               hit *= 100.0;
+               if (asprintf(&post_st, "; Cachehit=%0.2f%%", hit) < 0)
+                       post_st = NULL;
+       }
 
        log_buf(out, "  %s: IOPS=%s, BW=%s (%s)(%s/%llumsec)%s\n",
                        rs->unified_rw_rep ? "mixed" : io_ddir_name(ddir),
                        iops_p, bw_p, bw_p_alt, io_p,
                        (unsigned long long) ts->runtime[ddir],
-                       zbd_w_st ? : "");
+                       post_st ? : "");
 
-       free(zbd_w_st);
+       free(post_st);
        free(io_p);
        free(bw_p);
        free(bw_p_alt);
@@ -1153,6 +1163,16 @@ static void add_ddir_status_json(struct thread_stat *ts,
        json_object_add_value_float(dir_object, "iops_stddev", dev);
        json_object_add_value_int(dir_object, "iops_samples",
                                (&ts->iops_stat[ddir])->samples);
+
+       if (ts->cachehit + ts->cachemiss) {
+               uint64_t total;
+               double hit;
+
+               total = ts->cachehit + ts->cachemiss;
+               hit = (double) ts->cachehit / (double) total;
+               hit *= 100.0;
+               json_object_add_value_float(dir_object, "cachehit", hit);
+       }
 }
 
 static void show_thread_status_terse_all(struct thread_stat *ts,
@@ -1518,13 +1538,10 @@ struct json_object *show_thread_status(struct thread_stat *ts,
        return ret;
 }
 
-static void sum_stat(struct io_stat *dst, struct io_stat *src, bool first)
+static void __sum_stat(struct io_stat *dst, struct io_stat *src, bool first)
 {
        double mean, S;
 
-       if (src->samples == 0)
-               return;
-
        dst->min_val = min(dst->min_val, src->min_val);
        dst->max_val = max(dst->max_val, src->max_val);
 
@@ -1551,6 +1568,39 @@ static void sum_stat(struct io_stat *dst, struct io_stat *src, bool first)
        dst->samples += src->samples;
        dst->mean.u.f = mean;
        dst->S.u.f = S;
+
+}
+
+/*
+ * We sum two kinds of stats - one that is time based, in which case we
+ * apply the proper summing technique, and then one that is iops/bw
+ * numbers. For group_reporting, we should just add those up, not make
+ * them the mean of everything.
+ */
+static void sum_stat(struct io_stat *dst, struct io_stat *src, bool first,
+                    bool pure_sum)
+{
+       if (src->samples == 0)
+               return;
+
+       if (!pure_sum) {
+               __sum_stat(dst, src, first);
+               return;
+       }
+
+       if (first) {
+               dst->min_val = src->min_val;
+               dst->max_val = src->max_val;
+               dst->samples = src->samples;
+               dst->mean.u.f = src->mean.u.f;
+               dst->S.u.f = src->S.u.f;
+       } else {
+               dst->min_val += src->min_val;
+               dst->max_val += src->max_val;
+               dst->samples += src->samples;
+               dst->mean.u.f += src->mean.u.f;
+               dst->S.u.f += src->S.u.f;
+       }
 }
 
 void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src)
@@ -1586,22 +1636,22 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src,
 
        for (l = 0; l < DDIR_RWDIR_CNT; l++) {
                if (!dst->unified_rw_rep) {
-                       sum_stat(&dst->clat_stat[l], &src->clat_stat[l], first);
-                       sum_stat(&dst->slat_stat[l], &src->slat_stat[l], first);
-                       sum_stat(&dst->lat_stat[l], &src->lat_stat[l], first);
-                       sum_stat(&dst->bw_stat[l], &src->bw_stat[l], first);
-                       sum_stat(&dst->iops_stat[l], &src->iops_stat[l], first);
+                       sum_stat(&dst->clat_stat[l], &src->clat_stat[l], first, false);
+                       sum_stat(&dst->slat_stat[l], &src->slat_stat[l], first, false);
+                       sum_stat(&dst->lat_stat[l], &src->lat_stat[l], first, false);
+                       sum_stat(&dst->bw_stat[l], &src->bw_stat[l], first, true);
+                       sum_stat(&dst->iops_stat[l], &src->iops_stat[l], first, true);
 
                        dst->io_bytes[l] += src->io_bytes[l];
 
                        if (dst->runtime[l] < src->runtime[l])
                                dst->runtime[l] = src->runtime[l];
                } else {
-                       sum_stat(&dst->clat_stat[0], &src->clat_stat[l], first);
-                       sum_stat(&dst->slat_stat[0], &src->slat_stat[l], first);
-                       sum_stat(&dst->lat_stat[0], &src->lat_stat[l], first);
-                       sum_stat(&dst->bw_stat[0], &src->bw_stat[l], first);
-                       sum_stat(&dst->iops_stat[0], &src->iops_stat[l], first);
+                       sum_stat(&dst->clat_stat[0], &src->clat_stat[l], first, false);
+                       sum_stat(&dst->slat_stat[0], &src->slat_stat[l], first, false);
+                       sum_stat(&dst->lat_stat[0], &src->lat_stat[l], first, false);
+                       sum_stat(&dst->bw_stat[0], &src->bw_stat[l], first, true);
+                       sum_stat(&dst->iops_stat[0], &src->iops_stat[l], first, true);
 
                        dst->io_bytes[0] += src->io_bytes[l];
 
@@ -1616,7 +1666,7 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src,
                }
        }
 
-       sum_stat(&dst->sync_stat, &src->sync_stat, first);
+       sum_stat(&dst->sync_stat, &src->sync_stat, first, false);
        dst->usr_time += src->usr_time;
        dst->sys_time += src->sys_time;
        dst->ctx += src->ctx;
@@ -1665,6 +1715,8 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src,
        dst->total_submit += src->total_submit;
        dst->total_complete += src->total_complete;
        dst->nr_zone_resets += src->nr_zone_resets;
+       dst->cachehit += src->cachehit;
+       dst->cachemiss += src->cachemiss;
 }
 
 void init_group_run_stat(struct group_run_stats *gs)
@@ -2346,6 +2398,7 @@ void reset_io_stats(struct thread_data *td)
        ts->total_submit = 0;
        ts->total_complete = 0;
        ts->nr_zone_resets = 0;
+       ts->cachehit = ts->cachemiss = 0;
 }
 
 static void __add_stat_to_log(struct io_log *iolog, enum fio_ddir ddir,