init: automate displaying debug categories

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 533981fcc89ac20d9297808d8c88ec2b69617202..7d6ee63dc2dd3dac9faddaeb96da5e34d0a72713 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -13,6 +13,7 @@
 #include "json.h"
 #include "lib/getrusage.h"
 #include "idletime.h"
+#include "lib/pow2.h"
 
 struct fio_mutex *stat_mutex;
 
@@ -509,7 +510,9 @@ static int block_state_category(int block_state)
        case BLOCK_STATE_TRIM_FAILURE:
                return 2;
        default:
+               /* Silence compile warning on some BSDs and have a return */
                assert(0);
+               return -1;
        }
 }
 
@@ -1369,7 +1372,7 @@ void __show_run_stats(void)
        struct group_run_stats *runstats, *rs;
        struct thread_data *td;
        struct thread_stat *threadstats, *ts;
-       int i, j, nr_ts, last_ts, idx;
+       int i, j, k, nr_ts, last_ts, idx;
        int kb_base_warned = 0;
        int unit_base_warned = 0;
        struct json_object *root = NULL;
@@ -1481,8 +1484,8 @@ void __show_run_stats(void)
                ts->latency_window = td->o.latency_window;
 
                ts->nr_block_infos = td->ts.nr_block_infos;
-               for (i = 0; i < ts->nr_block_infos; i++)
-                       ts->block_infos[i] = td->ts.block_infos[i];
+               for (k = 0; k < ts->nr_block_infos; k++)
+                       ts->block_infos[k] = td->ts.block_infos[k];
 
                sum_thread_stats(ts, &td->ts, idx);
        }