Convert group_run_stats to use bytes instead of KiB/KB

In group_run_stats, convert these fields:
* io_kb (bytes transferred)
* agg (aggregate average bandwidth)
* min_bw
* max_bw

from tracking either KiB or KB depending on kb_base to simply tracking bytes.
Rename io_kb to iobytes to match this new meaning.

This will simplify computing quantities and bandwidth rates with both IEC
binary and SI decimal unit prefixes (e.g., GiB/s and GB/s) in future patches.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/client.c b/client.c
index 48d4c5296c8a135f4256512a815529b1b87d9541..1b4d3d7efdc92f3d8b895b2409befeca13a37124 100644 (file)
--- a/client.c
+++ b/client.c
@@ -972,7 +972,7 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
                dst->min_run[i]         = le64_to_cpu(src->min_run[i]);
                dst->max_bw[i]          = le64_to_cpu(src->max_bw[i]);
                dst->min_bw[i]          = le64_to_cpu(src->min_bw[i]);
                dst->min_run[i]         = le64_to_cpu(src->min_run[i]);
                dst->max_bw[i]          = le64_to_cpu(src->max_bw[i]);
                dst->min_bw[i]          = le64_to_cpu(src->min_bw[i]);

-               dst->io_kb[i]           = le64_to_cpu(src->io_kb[i]);
+               dst->iobytes[i]         = le64_to_cpu(src->iobytes[i]);

                dst->agg[i]             = le64_to_cpu(src->agg[i]);
        }
 
                dst->agg[i]             = le64_to_cpu(src->agg[i]);
        }
 

diff --git a/server.c b/server.c
index 2e05415240b23a921574483be1745ed0fe09854e..b7ebd633f2f19b961b0d10ec1a040bb7aca04a15 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1444,7 +1444,7 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
                dst->min_run[i]         = cpu_to_le64(src->min_run[i]);
                dst->max_bw[i]          = cpu_to_le64(src->max_bw[i]);
                dst->min_bw[i]          = cpu_to_le64(src->min_bw[i]);
                dst->min_run[i]         = cpu_to_le64(src->min_run[i]);
                dst->max_bw[i]          = cpu_to_le64(src->max_bw[i]);
                dst->min_bw[i]          = cpu_to_le64(src->min_bw[i]);

-               dst->io_kb[i]           = cpu_to_le64(src->io_kb[i]);
+               dst->iobytes[i]         = cpu_to_le64(src->iobytes[i]);

                dst->agg[i]             = cpu_to_le64(src->agg[i]);
        }
 
                dst->agg[i]             = cpu_to_le64(src->agg[i]);
        }
 

diff --git a/stat.c b/stat.c
index ebc5c78407580d6b54ee98987cc5130ae6672ebb..f014e60883c3a2946ba6c70d38fd2d3a82a03eb8 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -291,10 +291,10 @@ void show_group_stats(struct group_run_stats *rs, struct buf_output *out)
                if (!rs->max_run[i])
                        continue;
 
                if (!rs->max_run[i])
                        continue;
 

-               p1 = num2str(rs->io_kb[i], 6, rs->kb_base, i2p, 8);
-               p2 = num2str(rs->agg[i], 6, rs->kb_base, i2p, rs->unit_base);
-               p3 = num2str(rs->min_bw[i], 6, rs->kb_base, i2p, rs->unit_base);
-               p4 = num2str(rs->max_bw[i], 6, rs->kb_base, i2p, rs->unit_base);
+               p1 = num2str(rs->iobytes[i], 6, 1, i2p, 8);
+               p2 = num2str(rs->agg[i], 6, 1, i2p, rs->unit_base);
+               p3 = num2str(rs->min_bw[i], 6, 1, i2p, rs->unit_base);
+               p4 = num2str(rs->max_bw[i], 6, 1, i2p, rs->unit_base);

 
                log_buf(out, "%s: io=%s, aggrb=%s/s, minb=%s/s, maxb=%s/s,"
                         " mint=%llumsec, maxt=%llumsec\n",
 
                log_buf(out, "%s: io=%s, aggrb=%s/s, minb=%s/s, maxb=%s/s,"
                         " mint=%llumsec, maxt=%llumsec\n",


@@ -1418,7 +1418,7 @@ void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src)
                if (dst->min_bw[i] && dst->min_bw[i] > src->min_bw[i])
                        dst->min_bw[i] = src->min_bw[i];
 
                if (dst->min_bw[i] && dst->min_bw[i] > src->min_bw[i])
                        dst->min_bw[i] = src->min_bw[i];
 

-               dst->io_kb[i] += src->io_kb[i];
+               dst->iobytes[i] += src->iobytes[i];

                dst->agg[i] += src->agg[i];
        }
 
                dst->agg[i] += src->agg[i];
        }
 


@@ -1696,19 +1696,14 @@ void __show_run_stats(void)
                                rs->max_run[j] = ts->runtime[j];
 
                        bw = 0;
                                rs->max_run[j] = ts->runtime[j];
 
                        bw = 0;

-                       if (ts->runtime[j]) {
-                               unsigned long runt = ts->runtime[j];
-                               unsigned long long kb;
-
-                               kb = ts->io_bytes[j] / rs->kb_base;
-                               bw = kb * 1000 / runt;
-                       }
+                       if (ts->runtime[j])
+                               bw = ts->io_bytes[j] * 1000 / ts->runtime[j];

                        if (bw < rs->min_bw[j])
                                rs->min_bw[j] = bw;
                        if (bw > rs->max_bw[j])
                                rs->max_bw[j] = bw;
 
                        if (bw < rs->min_bw[j])
                                rs->min_bw[j] = bw;
                        if (bw > rs->max_bw[j])
                                rs->max_bw[j] = bw;
 

-                       rs->io_kb[j] += ts->io_bytes[j] / rs->kb_base;
+                       rs->iobytes[j] += ts->io_bytes[j];

                }
        }
 
                }
        }
 


@@ -1719,7 +1714,7 @@ void __show_run_stats(void)
 
                for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
                        if (rs->max_run[ddir])
 
                for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
                        if (rs->max_run[ddir])

-                               rs->agg[ddir] = (rs->io_kb[ddir] * 1000) /
+                               rs->agg[ddir] = (rs->iobytes[ddir] * 1000) /

                                                rs->max_run[ddir];
                }
        }
                                                rs->max_run[ddir];
                }
        }

diff --git a/stat.h b/stat.h
index 22083da79b967dd4d263f69dc81ac4f99fc6c05f..aa4ad806aa9159db7b15276fcf15853dae9c5bf8 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -7,7 +7,7 @@
 struct group_run_stats {
        uint64_t max_run[DDIR_RWDIR_CNT], min_run[DDIR_RWDIR_CNT];
        uint64_t max_bw[DDIR_RWDIR_CNT], min_bw[DDIR_RWDIR_CNT];
 struct group_run_stats {
        uint64_t max_run[DDIR_RWDIR_CNT], min_run[DDIR_RWDIR_CNT];
        uint64_t max_bw[DDIR_RWDIR_CNT], min_bw[DDIR_RWDIR_CNT];

-       uint64_t io_kb[DDIR_RWDIR_CNT];
+       uint64_t iobytes[DDIR_RWDIR_CNT];

        uint64_t agg[DDIR_RWDIR_CNT];
        uint32_t kb_base;
        uint32_t unit_base;
        uint64_t agg[DDIR_RWDIR_CNT];
        uint32_t kb_base;
        uint32_t unit_base;