Moved diskutil reporting functions to stat.c
authorLeaflessMelospiza <12461256+LeaflessMelospiza@users.noreply.github.com>
Wed, 15 Jan 2020 10:13:15 +0000 (15:43 +0530)
committerLeaflessMelospiza <12461256+LeaflessMelospiza@users.noreply.github.com>
Wed, 15 Jan 2020 11:12:04 +0000 (16:42 +0530)
diskutil.c
diskutil.h
stat.c
stat.h

index f074401501ba777de8f1f9516ed602feace0142c..6c6380bbc774e7b4dca76f6882dac9008008538b 100644 (file)
@@ -498,72 +498,6 @@ void init_disk_util(struct thread_data *td)
                f->du = __init_disk_util(td, f);
 }
 
-static void show_agg_stats(struct disk_util_agg *agg, int terse,
-                          struct buf_output *out)
-{
-       if (!agg->slavecount)
-               return;
-
-       if (!terse) {
-               log_buf(out, ", aggrios=%llu/%llu, aggrmerge=%llu/%llu, "
-                        "aggrticks=%llu/%llu, aggrin_queue=%llu, "
-                        "aggrutil=%3.2f%%",
-                       (unsigned long long) agg->ios[0] / agg->slavecount,
-                       (unsigned long long) agg->ios[1] / agg->slavecount,
-                       (unsigned long long) agg->merges[0] / agg->slavecount,
-                       (unsigned long long) agg->merges[1] / agg->slavecount,
-                       (unsigned long long) agg->ticks[0] / agg->slavecount,
-                       (unsigned long long) agg->ticks[1] / agg->slavecount,
-                       (unsigned long long) agg->time_in_queue / agg->slavecount,
-                       agg->max_util.u.f);
-       } else {
-               log_buf(out, ";slaves;%llu;%llu;%llu;%llu;%llu;%llu;%llu;%3.2f%%",
-                       (unsigned long long) agg->ios[0] / agg->slavecount,
-                       (unsigned long long) agg->ios[1] / agg->slavecount,
-                       (unsigned long long) agg->merges[0] / agg->slavecount,
-                       (unsigned long long) agg->merges[1] / agg->slavecount,
-                       (unsigned long long) agg->ticks[0] / agg->slavecount,
-                       (unsigned long long) agg->ticks[1] / agg->slavecount,
-                       (unsigned long long) agg->time_in_queue / agg->slavecount,
-                       agg->max_util.u.f);
-       }
-}
-
-static void aggregate_slaves_stats(struct disk_util *masterdu)
-{
-       struct disk_util_agg *agg = &masterdu->agg;
-       struct disk_util_stat *dus;
-       struct flist_head *entry;
-       struct disk_util *slavedu;
-       double util;
-
-       flist_for_each(entry, &masterdu->slaves) {
-               slavedu = flist_entry(entry, struct disk_util, slavelist);
-               dus = &slavedu->dus;
-               agg->ios[0] += dus->s.ios[0];
-               agg->ios[1] += dus->s.ios[1];
-               agg->merges[0] += dus->s.merges[0];
-               agg->merges[1] += dus->s.merges[1];
-               agg->sectors[0] += dus->s.sectors[0];
-               agg->sectors[1] += dus->s.sectors[1];
-               agg->ticks[0] += dus->s.ticks[0];
-               agg->ticks[1] += dus->s.ticks[1];
-               agg->time_in_queue += dus->s.time_in_queue;
-               agg->slavecount++;
-
-               util = (double) (100 * dus->s.io_ticks / (double) slavedu->dus.s.msec);
-               /* System utilization is the utilization of the
-                * component with the highest utilization.
-                */
-               if (util > agg->max_util.u.f)
-                       agg->max_util.u.f = util;
-
-       }
-
-       if (agg->max_util.u.f > 100.0)
-               agg->max_util.u.f = 100.0;
-}
-
 void disk_util_prune_entries(void)
 {
        fio_sem_down(disk_util_sem);
@@ -581,157 +515,6 @@ void disk_util_prune_entries(void)
        fio_sem_remove(disk_util_sem);
 }
 
-void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
-                    int terse, struct buf_output *out)
-{
-       double util = 0;
-
-       if (dus->s.msec)
-               util = (double) 100 * dus->s.io_ticks / (double) dus->s.msec;
-       if (util > 100.0)
-               util = 100.0;
-
-       if (!terse) {
-               if (agg->slavecount)
-                       log_buf(out, "  ");
-
-               log_buf(out, "  %s: ios=%llu/%llu, merge=%llu/%llu, "
-                        "ticks=%llu/%llu, in_queue=%llu, util=%3.2f%%",
-                               dus->name,
-                               (unsigned long long) dus->s.ios[0],
-                               (unsigned long long) dus->s.ios[1],
-                               (unsigned long long) dus->s.merges[0],
-                               (unsigned long long) dus->s.merges[1],
-                               (unsigned long long) dus->s.ticks[0],
-                               (unsigned long long) dus->s.ticks[1],
-                               (unsigned long long) dus->s.time_in_queue,
-                               util);
-       } else {
-               log_buf(out, ";%s;%llu;%llu;%llu;%llu;%llu;%llu;%llu;%3.2f%%",
-                               dus->name,
-                               (unsigned long long) dus->s.ios[0],
-                               (unsigned long long) dus->s.ios[1],
-                               (unsigned long long) dus->s.merges[0],
-                               (unsigned long long) dus->s.merges[1],
-                               (unsigned long long) dus->s.ticks[0],
-                               (unsigned long long) dus->s.ticks[1],
-                               (unsigned long long) dus->s.time_in_queue,
-                               util);
-       }
-
-       /*
-        * If the device has slaves, aggregate the stats for
-        * those slave devices also.
-        */
-       show_agg_stats(agg, terse, out);
-
-       if (!terse)
-               log_buf(out, "\n");
-}
-
-void json_array_add_disk_util(struct disk_util_stat *dus,
-               struct disk_util_agg *agg, struct json_array *array)
-{
-       struct json_object *obj;
-       double util = 0;
-
-       if (dus->s.msec)
-               util = (double) 100 * dus->s.io_ticks / (double) dus->s.msec;
-       if (util > 100.0)
-               util = 100.0;
-
-       obj = json_create_object();
-       json_array_add_value_object(array, obj);
-
-       json_object_add_value_string(obj, "name", dus->name);
-       json_object_add_value_int(obj, "read_ios", dus->s.ios[0]);
-       json_object_add_value_int(obj, "write_ios", dus->s.ios[1]);
-       json_object_add_value_int(obj, "read_merges", dus->s.merges[0]);
-       json_object_add_value_int(obj, "write_merges", dus->s.merges[1]);
-       json_object_add_value_int(obj, "read_ticks", dus->s.ticks[0]);
-       json_object_add_value_int(obj, "write_ticks", dus->s.ticks[1]);
-       json_object_add_value_int(obj, "in_queue", dus->s.time_in_queue);
-       json_object_add_value_float(obj, "util", util);
-
-       /*
-        * If the device has slaves, aggregate the stats for
-        * those slave devices also.
-        */
-       if (!agg->slavecount)
-               return;
-       json_object_add_value_int(obj, "aggr_read_ios",
-                               agg->ios[0] / agg->slavecount);
-       json_object_add_value_int(obj, "aggr_write_ios",
-                               agg->ios[1] / agg->slavecount);
-       json_object_add_value_int(obj, "aggr_read_merges",
-                               agg->merges[0] / agg->slavecount);
-       json_object_add_value_int(obj, "aggr_write_merge",
-                               agg->merges[1] / agg->slavecount);
-       json_object_add_value_int(obj, "aggr_read_ticks",
-                               agg->ticks[0] / agg->slavecount);
-       json_object_add_value_int(obj, "aggr_write_ticks",
-                               agg->ticks[1] / agg->slavecount);
-       json_object_add_value_int(obj, "aggr_in_queue",
-                               agg->time_in_queue / agg->slavecount);
-       json_object_add_value_float(obj, "aggr_util", agg->max_util.u.f);
-}
-
-static void json_object_add_disk_utils(struct json_object *obj,
-                                      struct flist_head *head)
-{
-       struct json_array *array = json_create_array();
-       struct flist_head *entry;
-       struct disk_util *du;
-
-       json_object_add_value_array(obj, "disk_util", array);
-
-       flist_for_each(entry, head) {
-               du = flist_entry(entry, struct disk_util, list);
-
-               aggregate_slaves_stats(du);
-               json_array_add_disk_util(&du->dus, &du->agg, array);
-       }
-}
-
-void show_disk_util(int terse, struct json_object *parent,
-                   struct buf_output *out)
-{
-       struct flist_head *entry;
-       struct disk_util *du;
-       bool do_json;
-
-       if (!is_running_backend())
-               return;
-
-       fio_sem_down(disk_util_sem);
-
-       if (flist_empty(&disk_list)) {
-               fio_sem_up(disk_util_sem);
-               return;
-       }
-
-       if ((output_format & FIO_OUTPUT_JSON) && parent)
-               do_json = true;
-       else
-               do_json = false;
-
-       if (!terse && !do_json)
-               log_buf(out, "\nDisk stats (read/write):\n");
-
-       if (do_json)
-               json_object_add_disk_utils(parent, &disk_list);
-       else if (output_format & ~(FIO_OUTPUT_JSON | FIO_OUTPUT_JSON_PLUS)) {
-               flist_for_each(entry, &disk_list) {
-                       du = flist_entry(entry, struct disk_util, list);
-
-                       aggregate_slaves_stats(du);
-                       print_disk_util(&du->dus, &du->agg, terse, out);
-               }
-       }
-
-       fio_sem_up(disk_util_sem);
-}
-
 void setup_disk_util(void)
 {
        disk_util_sem = fio_sem_init(FIO_SEM_UNLOCKED);
index f6b09d22b0a4d1a91a9006900fa00bfb1019b6be..83bcbf895e799f989645d86cbc23f0dbdf698f39 100644 (file)
@@ -1,6 +1,5 @@
 #ifndef FIO_DISKUTIL_H
 #define FIO_DISKUTIL_H
-#include "json.h"
 #define FIO_DU_NAME_SZ         64
 
 #include "helper_thread.h"
@@ -105,26 +104,15 @@ extern struct flist_head disk_list;
  * disk util stuff
  */
 #ifdef FIO_HAVE_DISK_UTIL
-extern void print_disk_util(struct disk_util_stat *, struct disk_util_agg *, int terse, struct buf_output *);
-extern void show_disk_util(int terse, struct json_object *parent, struct buf_output *);
-extern void json_array_add_disk_util(struct disk_util_stat *dus,
-               struct disk_util_agg *agg, struct json_array *parent);
 extern void init_disk_util(struct thread_data *);
 extern int update_io_ticks(void);
 extern void setup_disk_util(void);
 extern void disk_util_prune_entries(void);
 #else
 /* keep this as a function to avoid a warning in handle_du() */
-static inline void print_disk_util(struct disk_util_stat *du,
-                                  struct disk_util_agg *agg, int terse,
-                                  struct buf_output *out)
-{
-}
-#define show_disk_util(terse, parent, out) do { } while (0)
 #define disk_util_prune_entries()
 #define init_disk_util(td)
 #define setup_disk_util()
-#define json_array_add_disk_util(dus, agg, parent)
 
 static inline int update_io_ticks(void)
 {
diff --git a/stat.c b/stat.c
index 2b303494dc7c9e0b534fa28b803d76ee36314912..55d83fcc903e62e5e91fb49ac35caf24535cac6a 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -786,6 +786,218 @@ static void show_ss_normal(struct thread_stat *ts, struct buf_output *out)
        free(p2);
 }
 
+static void show_agg_stats(struct disk_util_agg *agg, int terse,
+                          struct buf_output *out)
+{
+       if (!agg->slavecount)
+               return;
+
+       if (!terse) {
+               log_buf(out, ", aggrios=%llu/%llu, aggrmerge=%llu/%llu, "
+                        "aggrticks=%llu/%llu, aggrin_queue=%llu, "
+                        "aggrutil=%3.2f%%",
+                       (unsigned long long) agg->ios[0] / agg->slavecount,
+                       (unsigned long long) agg->ios[1] / agg->slavecount,
+                       (unsigned long long) agg->merges[0] / agg->slavecount,
+                       (unsigned long long) agg->merges[1] / agg->slavecount,
+                       (unsigned long long) agg->ticks[0] / agg->slavecount,
+                       (unsigned long long) agg->ticks[1] / agg->slavecount,
+                       (unsigned long long) agg->time_in_queue / agg->slavecount,
+                       agg->max_util.u.f);
+       } else {
+               log_buf(out, ";slaves;%llu;%llu;%llu;%llu;%llu;%llu;%llu;%3.2f%%",
+                       (unsigned long long) agg->ios[0] / agg->slavecount,
+                       (unsigned long long) agg->ios[1] / agg->slavecount,
+                       (unsigned long long) agg->merges[0] / agg->slavecount,
+                       (unsigned long long) agg->merges[1] / agg->slavecount,
+                       (unsigned long long) agg->ticks[0] / agg->slavecount,
+                       (unsigned long long) agg->ticks[1] / agg->slavecount,
+                       (unsigned long long) agg->time_in_queue / agg->slavecount,
+                       agg->max_util.u.f);
+       }
+}
+
+static void aggregate_slaves_stats(struct disk_util *masterdu)
+{
+       struct disk_util_agg *agg = &masterdu->agg;
+       struct disk_util_stat *dus;
+       struct flist_head *entry;
+       struct disk_util *slavedu;
+       double util;
+
+       flist_for_each(entry, &masterdu->slaves) {
+               slavedu = flist_entry(entry, struct disk_util, slavelist);
+               dus = &slavedu->dus;
+               agg->ios[0] += dus->s.ios[0];
+               agg->ios[1] += dus->s.ios[1];
+               agg->merges[0] += dus->s.merges[0];
+               agg->merges[1] += dus->s.merges[1];
+               agg->sectors[0] += dus->s.sectors[0];
+               agg->sectors[1] += dus->s.sectors[1];
+               agg->ticks[0] += dus->s.ticks[0];
+               agg->ticks[1] += dus->s.ticks[1];
+               agg->time_in_queue += dus->s.time_in_queue;
+               agg->slavecount++;
+
+               util = (double) (100 * dus->s.io_ticks / (double) slavedu->dus.s.msec);
+               /* System utilization is the utilization of the
+                * component with the highest utilization.
+                */
+               if (util > agg->max_util.u.f)
+                       agg->max_util.u.f = util;
+
+       }
+
+       if (agg->max_util.u.f > 100.0)
+               agg->max_util.u.f = 100.0;
+}
+
+void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
+                    int terse, struct buf_output *out)
+{
+       double util = 0;
+
+       if (dus->s.msec)
+               util = (double) 100 * dus->s.io_ticks / (double) dus->s.msec;
+       if (util > 100.0)
+               util = 100.0;
+
+       if (!terse) {
+               if (agg->slavecount)
+                       log_buf(out, "  ");
+
+               log_buf(out, "  %s: ios=%llu/%llu, merge=%llu/%llu, "
+                        "ticks=%llu/%llu, in_queue=%llu, util=%3.2f%%",
+                               dus->name,
+                               (unsigned long long) dus->s.ios[0],
+                               (unsigned long long) dus->s.ios[1],
+                               (unsigned long long) dus->s.merges[0],
+                               (unsigned long long) dus->s.merges[1],
+                               (unsigned long long) dus->s.ticks[0],
+                               (unsigned long long) dus->s.ticks[1],
+                               (unsigned long long) dus->s.time_in_queue,
+                               util);
+       } else {
+               log_buf(out, ";%s;%llu;%llu;%llu;%llu;%llu;%llu;%llu;%3.2f%%",
+                               dus->name,
+                               (unsigned long long) dus->s.ios[0],
+                               (unsigned long long) dus->s.ios[1],
+                               (unsigned long long) dus->s.merges[0],
+                               (unsigned long long) dus->s.merges[1],
+                               (unsigned long long) dus->s.ticks[0],
+                               (unsigned long long) dus->s.ticks[1],
+                               (unsigned long long) dus->s.time_in_queue,
+                               util);
+       }
+
+       /*
+        * If the device has slaves, aggregate the stats for
+        * those slave devices also.
+        */
+       show_agg_stats(agg, terse, out);
+
+       if (!terse)
+               log_buf(out, "\n");
+}
+
+void json_array_add_disk_util(struct disk_util_stat *dus,
+               struct disk_util_agg *agg, struct json_array *array)
+{
+       struct json_object *obj;
+       double util = 0;
+
+       if (dus->s.msec)
+               util = (double) 100 * dus->s.io_ticks / (double) dus->s.msec;
+       if (util > 100.0)
+               util = 100.0;
+
+       obj = json_create_object();
+       json_array_add_value_object(array, obj);
+
+       json_object_add_value_string(obj, "name", dus->name);
+       json_object_add_value_int(obj, "read_ios", dus->s.ios[0]);
+       json_object_add_value_int(obj, "write_ios", dus->s.ios[1]);
+       json_object_add_value_int(obj, "read_merges", dus->s.merges[0]);
+       json_object_add_value_int(obj, "write_merges", dus->s.merges[1]);
+       json_object_add_value_int(obj, "read_ticks", dus->s.ticks[0]);
+       json_object_add_value_int(obj, "write_ticks", dus->s.ticks[1]);
+       json_object_add_value_int(obj, "in_queue", dus->s.time_in_queue);
+       json_object_add_value_float(obj, "util", util);
+
+       /*
+        * If the device has slaves, aggregate the stats for
+        * those slave devices also.
+        */
+       if (!agg->slavecount)
+               return;
+       json_object_add_value_int(obj, "aggr_read_ios",
+                               agg->ios[0] / agg->slavecount);
+       json_object_add_value_int(obj, "aggr_write_ios",
+                               agg->ios[1] / agg->slavecount);
+       json_object_add_value_int(obj, "aggr_read_merges",
+                               agg->merges[0] / agg->slavecount);
+       json_object_add_value_int(obj, "aggr_write_merge",
+                               agg->merges[1] / agg->slavecount);
+       json_object_add_value_int(obj, "aggr_read_ticks",
+                               agg->ticks[0] / agg->slavecount);
+       json_object_add_value_int(obj, "aggr_write_ticks",
+                               agg->ticks[1] / agg->slavecount);
+       json_object_add_value_int(obj, "aggr_in_queue",
+                               agg->time_in_queue / agg->slavecount);
+       json_object_add_value_float(obj, "aggr_util", agg->max_util.u.f);
+}
+
+static void json_object_add_disk_utils(struct json_object *obj,
+                                      struct flist_head *head)
+{
+       struct json_array *array = json_create_array();
+       struct flist_head *entry;
+       struct disk_util *du;
+
+       json_object_add_value_array(obj, "disk_util", array);
+
+       flist_for_each(entry, head) {
+               du = flist_entry(entry, struct disk_util, list);
+
+               aggregate_slaves_stats(du);
+               json_array_add_disk_util(&du->dus, &du->agg, array);
+       }
+}
+
+void show_disk_util(int terse, struct json_object *parent,
+                   struct buf_output *out)
+{
+       struct flist_head *entry;
+       struct disk_util *du;
+       bool do_json;
+
+       if (!is_running_backend())
+               return;
+
+       if (flist_empty(&disk_list)) {
+               return;
+       }
+
+       if ((output_format & FIO_OUTPUT_JSON) && parent)
+               do_json = true;
+       else
+               do_json = false;
+
+       if (!terse && !do_json)
+               log_buf(out, "\nDisk stats (read/write):\n");
+
+       if (do_json)
+               json_object_add_disk_utils(parent, &disk_list);
+       else if (output_format & ~(FIO_OUTPUT_JSON | FIO_OUTPUT_JSON_PLUS)) {
+               flist_for_each(entry, &disk_list) {
+                       du = flist_entry(entry, struct disk_util, list);
+
+                       aggregate_slaves_stats(du);
+                       print_disk_util(&du->dus, &du->agg, terse, out);
+               }
+       }
+}
+
 static void show_thread_status_normal(struct thread_stat *ts,
                                      struct group_run_stats *rs,
                                      struct buf_output *out)
diff --git a/stat.h b/stat.h
index ba7e290d5d95c49117157852b64fdd3e91be2b02..2ce91ff0b122606b5efb4c0553e85eb0918d9d10 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -3,6 +3,8 @@
 
 #include "iolog.h"
 #include "lib/output_buffer.h"
+#include "diskutil.h"
+#include "json.h"
 
 struct group_run_stats {
        uint64_t max_run[DDIR_RWDIR_CNT], min_run[DDIR_RWDIR_CNT];
@@ -332,9 +334,13 @@ extern void add_iops_sample(struct thread_data *, struct io_u *,
 extern void add_bw_sample(struct thread_data *, struct io_u *,
                                unsigned int, unsigned long long);
 extern void add_sync_clat_sample(struct thread_stat *ts,
-                                       unsigned long long nsec);
+                               unsigned long long nsec);
 extern int calc_log_samples(void);
 
+extern void print_disk_util(struct disk_util_stat *, struct disk_util_agg *, int terse, struct buf_output *);
+extern void json_array_add_disk_util(struct disk_util_stat *dus,
+                               struct disk_util_agg *agg, struct json_array *parent);
+
 extern struct io_log *agg_io_log[DDIR_RWDIR_CNT];
 extern bool write_bw_log;