Use 0 instead of DDIR_READ to iterate from 0 to DDIR_RWDIR_CNT

I think this is better since we want to count up DDIR_RWDIR_CNT,
but not specifically (count - something) even if something is 0,
and that's basically what DDIR_RWDIR_CNT is there for to equal
SYNC=3 after READ/WRITE/TRIM in io_ddir.h.

Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/eta.c b/eta.c
index 1d66163ba68fb4a1fc9c8f9db4a5bbcc14f4b0a0..adf7f94c658607009c85ad49b8348f9160e33fa1 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -440,7 +440,7 @@ bool calc_thread_status(struct jobs_eta *je, int force)
                if (td->runstate > TD_SETTING_UP) {
                        int ddir;
 
                if (td->runstate > TD_SETTING_UP) {
                        int ddir;
 

-                       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+                       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {

                                if (unified_rw_rep) {
                                        io_bytes[0] += td->io_bytes[ddir];
                                        io_iops[0] += td->io_blocks[ddir];
                                if (unified_rw_rep) {
                                        io_bytes[0] += td->io_bytes[ddir];
                                        io_iops[0] += td->io_blocks[ddir];


@@ -574,7 +574,7 @@ void display_thread_status(struct jobs_eta *je)
                        sprintf(perc_str, "%3.1f%%", perc);
                }
 
                        sprintf(perc_str, "%3.1f%%", perc);
                }
 

-               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+               for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {

                        rate_str[ddir] = num2str(je->rate[ddir], 4,
                                                1024, je->is_pow2, je->unit_base);
                        iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0, N2S_NONE);
                        rate_str[ddir] = num2str(je->rate[ddir], 4,
                                                1024, je->is_pow2, je->unit_base);
                        iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0, N2S_NONE);


@@ -601,7 +601,7 @@ void display_thread_status(struct jobs_eta *je)
                        p += sprintf(p, "%*s", linelen_last - l, "");
                linelen_last = l;
 
                        p += sprintf(p, "%*s", linelen_last - l, "");
                linelen_last = l;
 

-               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+               for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {

                        free(rate_str[ddir]);
                        free(iops_str[ddir]);
                }
                        free(rate_str[ddir]);
                        free(iops_str[ddir]);
                }

diff --git a/io_u.c b/io_u.c
index 1daaf7bea48407c1e6b21f5143730a7c3d22ff97..f1a3916f5096ea7cc07be1c488b42f32307fc83d 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -1902,7 +1902,7 @@ static void init_icd(struct thread_data *td, struct io_completion_data *icd,
        icd->nr = nr;
 
        icd->error = 0;
        icd->nr = nr;
 
        icd->error = 0;

-       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++)

                icd->bytes_done[ddir] = 0;
 }
 
                icd->bytes_done[ddir] = 0;
 }
 


@@ -1941,7 +1941,7 @@ int io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
                return -1;
        }
 
                return -1;
        }
 

-       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++)

                td->bytes_done[ddir] += icd.bytes_done[ddir];
 
        return 0;
                td->bytes_done[ddir] += icd.bytes_done[ddir];
 
        return 0;


@@ -1980,7 +1980,7 @@ int io_u_queued_complete(struct thread_data *td, int min_evts)
                return -1;
        }
 
                return -1;
        }
 

-       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++)

                td->bytes_done[ddir] += icd.bytes_done[ddir];
 
        return ret;
                td->bytes_done[ddir] += icd.bytes_done[ddir];
 
        return ret;

diff --git a/stat.c b/stat.c
index f1d468c783b558ec2acef34f87d41ba748824518..0bb21d0093ac05a4e71cda24cea5cfde25ee916b 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -2442,7 +2442,7 @@ static int add_bw_samples(struct thread_data *td, struct timeval *t)
        /*
         * Compute both read and write rates for the interval.
         */
        /*
         * Compute both read and write rates for the interval.
         */

-       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {

                uint64_t delta;
 
                delta = td->this_io_bytes[ddir] - td->stat_io_bytes[ddir];
                uint64_t delta;
 
                delta = td->this_io_bytes[ddir] - td->stat_io_bytes[ddir];


@@ -2517,7 +2517,7 @@ static int add_iops_samples(struct thread_data *td, struct timeval *t)
        /*
         * Compute both read and write rates for the interval.
         */
        /*
         * Compute both read and write rates for the interval.
         */

-       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+       for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {

                uint64_t delta;
 
                delta = td->this_io_blocks[ddir] - td->stat_io_blocks[ddir];
                uint64_t delta;
 
                delta = td->this_io_blocks[ddir] - td->stat_io_blocks[ddir];

diff --git a/steadystate.c b/steadystate.c
index 43c715c96422dddfcbca6f8fed9871c80ee4ffd2..98f027cee4013ac4f75db7a4ade31c8d5f8056fa 100644 (file)
--- a/steadystate.c
+++ b/steadystate.c
@@ -231,7 +231,7 @@ void steadystate_check(void)
                }
 
                td_io_u_lock(td);
                }
 
                td_io_u_lock(td);

-               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+               for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {

                        td_iops += td->io_blocks[ddir];
                        td_bytes += td->io_bytes[ddir];
                }
                        td_iops += td->io_blocks[ddir];
                        td_bytes += td->io_bytes[ddir];
                }