Rename ddir_nr -> ddir_seq_nr

Another mode will be added, so lets rename this one internally
to make the distinction clear.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/fio.h b/fio.h
index e05d95a53175bb425f747891b0dfb707e015f1e7..e9fdc68f572667586e240fa3f4cb142c36403060 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -146,7 +146,7 @@ struct thread_options {
        char *ioengine;
        enum td_ddir td_ddir;
        unsigned int kb_base;
        char *ioengine;
        enum td_ddir td_ddir;
        unsigned int kb_base;

-       unsigned int ddir_nr;
+       unsigned int ddir_seq_nr;

        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;


@@ -410,7 +410,7 @@ struct thread_data {
        os_random_state_t rwmix_state;
        unsigned long rwmix_issues;
        enum fio_ddir rwmix_ddir;
        os_random_state_t rwmix_state;
        unsigned long rwmix_issues;
        enum fio_ddir rwmix_ddir;

-       unsigned int ddir_nr;
+       unsigned int ddir_seq_nr;

 
        /*
         * IO history logs for verification. We use a tree for sorting,
 
        /*
         * IO history logs for verification. We use a tree for sorting,

diff --git a/init.c b/init.c
index bb645b0b9b7808c1c22b8ac4f7a98271455a61c8..bc1bb9334e1c646d3089d8e3fdf04a9a20faf82c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -557,7 +557,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
        td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
        td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
        td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
        td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;

-       td->ddir_nr = td->o.ddir_nr;
+       td->ddir_seq_nr = td->o.ddir_seq_nr;

 
        if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
                prev_group_jobs = 0;
 
        if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
                prev_group_jobs = 0;

diff --git a/io_u.c b/io_u.c
index f27cddacf95f881792d392f7ca4097a1781e496d..bb00559c04a8ac5f4917ee8d3b6832b90f076007 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -54,7 +54,7 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
                 * If we have a mixed random workload, we may
                 * encounter blocks we already did IO to.
                 */
                 * If we have a mixed random workload, we may
                 * encounter blocks we already did IO to.
                 */

-               if ((td->o.ddir_nr == 1) && !random_map_free(f, block))
+               if ((td->o.ddir_seq_nr == 1) && !random_map_free(f, block))

                        break;
 
                idx = RAND_MAP_IDX(f, block);
                        break;
 
                idx = RAND_MAP_IDX(f, block);


@@ -201,8 +201,8 @@ static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
        unsigned long long b;
        enum fio_ddir ddir = io_u->ddir;
 
        unsigned long long b;
        enum fio_ddir ddir = io_u->ddir;
 

-       if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) {
-               td->ddir_nr = td->o.ddir_nr;
+       if (td_random(td) && (td->o.ddir_seq_nr && !--td->ddir_seq_nr)) {
+               td->ddir_seq_nr = td->o.ddir_seq_nr;

 
                if (get_next_rand_offset(td, f, ddir, &b)) {
                        dprint(FD_IO, "%s: getting rand offset failed\n",
 
                if (get_next_rand_offset(td, f, ddir, &b)) {
                        dprint(FD_IO, "%s: getting rand offset failed\n",

diff --git a/options.c b/options.c
index 923076752b6f6c03b979e52682c5de3c4dbf518f..c9fb88625b5c2ac6754ff28bc4511c917057c74d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -203,9 +203,9 @@ static int str_rw_cb(void *data, const char *str)
        struct thread_data *td = data;
        char *nr = get_opt_postfix(str);
 
        struct thread_data *td = data;
        char *nr = get_opt_postfix(str);
 

-       td->o.ddir_nr = 1;
+       td->o.ddir_seq_nr = 1;

        if (nr) {
        if (nr) {

-               td->o.ddir_nr = atoi(nr);
+               td->o.ddir_seq_nr = atoi(nr);

                free(nr);
        }
 
                free(nr);
        }