[PATCH] Must use ->real_file_size

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 45e8bb81ccc6e4dcfd7bbab57c781824c2d63161..834e5d214d5da390365858f36d67ed3fd67127a6 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -27,10 +27,13 @@ static int random_map_free(struct thread_data *td, struct fio_file *f,
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
                            struct io_u *io_u)
 {
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
                            struct io_u *io_u)
 {

-       unsigned long long block = io_u->offset / (unsigned long long) td->min_bs;
-       unsigned int blocks = 0;
+       unsigned int min_bs = td->min_bs[io_u->ddir];
+       unsigned long long block;
+       unsigned int blocks;

 
 

-       while (blocks < (io_u->buflen / td->min_bs)) {
+       block = io_u->offset / (unsigned long long) min_bs;
+       blocks = 0;
+       while (blocks < (io_u->buflen / min_bs)) {

                unsigned int idx, bit;
 
                if (!random_map_free(td, f, block))
                unsigned int idx, bit;
 
                if (!random_map_free(td, f, block))


@@ -46,8 +49,8 @@ static void mark_random_map(struct thread_data *td, struct fio_file *f,
                blocks++;
        }
 
                blocks++;
        }
 

-       if ((blocks * td->min_bs) < io_u->buflen)
-               io_u->buflen = blocks * td->min_bs;
+       if ((blocks * min_bs) < io_u->buflen)
+               io_u->buflen = blocks * min_bs;

 }
 
 /*
 }
 
 /*


@@ -60,7 +63,7 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 
        *b = 0;
        i = 0;
 
        *b = 0;
        i = 0;

-       while ((*b) * td->min_bs < f->file_size) {
+       while ((*b) * td->rw_min_bs < f->real_file_size) {

                if (f->file_map[i] != -1UL) {
                        *b += ffz(f->file_map[i]);
                        return 0;
                if (f->file_map[i] != -1UL) {
                        *b += ffz(f->file_map[i]);
                        return 0;


@@ -79,19 +82,21 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,

-                          unsigned long long *offset)
+                          unsigned long long *offset, int ddir)

 {
        unsigned long long b, rb;
        long r;
 
        if (!td->sequential) {
 {
        unsigned long long b, rb;
        long r;
 
        if (!td->sequential) {

-               unsigned long long max_blocks = td->io_size / td->min_bs;
+               unsigned long long max_blocks = f->file_size / td->min_bs[ddir];

                int loops = 50;
 
                do {
                        r = os_random_long(&td->random_state);
                        b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
                int loops = 50;
 
                do {
                        r = os_random_long(&td->random_state);
                        b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));

-                       rb = b + (f->file_offset / td->min_bs);
+                       if (td->norandommap)
+                               break;
+                       rb = b + (f->file_offset / td->min_bs[ddir]);

                        loops--;
                } while (!random_map_free(td, f, rb) && loops);
 
                        loops--;
                } while (!random_map_free(td, f, rb) && loops);
 


@@ -100,29 +105,30 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
                                return 1;
                }
        } else
                                return 1;
                }
        } else

-               b = f->last_pos / td->min_bs;
+               b = f->last_pos / td->min_bs[ddir];

 
 

-       *offset = (b * td->min_bs) + f->file_offset;
-       if (*offset > f->file_size)
+       *offset = (b * td->min_bs[ddir]) + f->file_offset;
+       if (*offset > f->real_file_size)

                return 1;
 
        return 0;
 }
 
                return 1;
 
        return 0;
 }
 

-static unsigned int get_next_buflen(struct thread_data *td)
+static unsigned int get_next_buflen(struct thread_data *td, int ddir)

 {
        unsigned int buflen;
        long r;
 
 {
        unsigned int buflen;
        long r;
 

-       if (td->min_bs == td->max_bs)
-               buflen = td->min_bs;
+       if (td->min_bs[ddir] == td->max_bs[ddir])
+               buflen = td->min_bs[ddir];

        else {
                r = os_random_long(&td->bsrange_state);
        else {
                r = os_random_long(&td->bsrange_state);

-               buflen = (1 + (double) (td->max_bs - 1) * r / (RAND_MAX + 1.0));
-               buflen = (buflen + td->min_bs - 1) & ~(td->min_bs - 1);
+               buflen = (unsigned int) (1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+               if (!td->bs_unaligned)
+                       buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);

        }
 
        }
 

-       if (buflen > td->io_size - td->this_io_bytes[td->ddir]) {
+       if (buflen > td->io_size - td->this_io_bytes[ddir]) {

                /*
                 * if using direct/raw io, we may not be able to
                 * shrink the size. so just fail it.
                /*
                 * if using direct/raw io, we may not be able to
                 * shrink the size. so just fail it.


@@ -130,7 +136,7 @@ static unsigned int get_next_buflen(struct thread_data *td)
                if (td->io_ops->flags & FIO_RAWIO)
                        return 0;
 
                if (td->io_ops->flags & FIO_RAWIO)
                        return 0;
 

-               buflen = td->io_size - td->this_io_bytes[td->ddir];
+               buflen = td->io_size - td->this_io_bytes[ddir];

        }
 
        return buflen;
        }
 
        return buflen;


@@ -141,13 +147,13 @@ static unsigned int get_next_buflen(struct thread_data *td)
  * mixed read/write workload, check the rwmix cycle and switch if
  * necessary.
  */
  * mixed read/write workload, check the rwmix cycle and switch if
  * necessary.
  */

-static int get_rw_ddir(struct thread_data *td)
+static enum fio_ddir get_rw_ddir(struct thread_data *td)

 {
        if (td_rw(td)) {
                struct timeval now;
                unsigned long elapsed;
 
 {
        if (td_rw(td)) {
                struct timeval now;
                unsigned long elapsed;
 

-               gettimeofday(&now, NULL);
+               fio_gettime(&now, NULL);

                elapsed = mtime_since_now(&td->rwmix_switch);
 
                /*
                elapsed = mtime_since_now(&td->rwmix_switch);
 
                /*


@@ -199,19 +205,18 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
                return 0;
        }
 
                return 0;
        }
 

+       io_u->ddir = get_rw_ddir(td);
+

        /*
         * No log, let the seq/rand engine retrieve the next position.
         */
        /*
         * No log, let the seq/rand engine retrieve the next position.
         */

-       if (!get_next_offset(td, f, &io_u->offset)) {
-               io_u->buflen = get_next_buflen(td);
-
+       if (!get_next_offset(td, f, &io_u->offset, io_u->ddir)) {
+               io_u->buflen = get_next_buflen(td, io_u->ddir);

                if (io_u->buflen) {
                if (io_u->buflen) {

-                       io_u->ddir = get_rw_ddir(td);
-

                        /*
                         * If using a write iolog, store this entry.
                         */
                        /*
                         * If using a write iolog, store this entry.
                         */

-                       if (td->write_iolog)
+                       if (td->write_iolog_file)

                                write_iolog_put(td, io_u);
 
                        io_u->file = f;
                                write_iolog_put(td, io_u);
 
                        io_u->file = f;


@@ -262,13 +267,13 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
                return NULL;
        }
 
                return NULL;
        }
 

-       if (io_u->buflen + io_u->offset > f->file_size) {
+       if (io_u->buflen + io_u->offset > f->real_file_size) {

                if (td->io_ops->flags & FIO_RAWIO) {
                        put_io_u(td, io_u);
                        return NULL;
                }
 
                if (td->io_ops->flags & FIO_RAWIO) {
                        put_io_u(td, io_u);
                        return NULL;
                }
 

-               io_u->buflen = f->file_size - io_u->offset;
+               io_u->buflen = f->real_file_size - io_u->offset;

        }
 
        if (io_u->ddir != DDIR_SYNC) {
        }
 
        if (io_u->ddir != DDIR_SYNC) {


@@ -277,7 +282,7 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if (!td->read_iolog && !td->sequential)
+               if (!td->read_iolog && !td->sequential && !td->norandommap)

                        mark_random_map(td, f, io_u);
 
                f->last_pos += io_u->buflen;
                        mark_random_map(td, f, io_u);
 
                f->last_pos += io_u->buflen;


@@ -291,14 +296,13 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
                return NULL;
        }
 
                return NULL;
        }
 

-       gettimeofday(&io_u->start_time, NULL);
+       fio_gettime(&io_u->start_time, NULL);

        return io_u;
 }
 
 void io_completed(struct thread_data *td, struct io_u *io_u,
                  struct io_completion_data *icd)
 {
        return io_u;
 }
 
 void io_completed(struct thread_data *td, struct io_u *io_u,
                  struct io_completion_data *icd)
 {

-       struct timeval e;

        unsigned long msec;
 
        if (io_u->ddir == DDIR_SYNC) {
        unsigned long msec;
 
        if (io_u->ddir == DDIR_SYNC) {


@@ -308,21 +312,21 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
 
        td->last_was_sync = 0;
 
 
        td->last_was_sync = 0;
 

-       gettimeofday(&e, NULL);
-

        if (!io_u->error) {
                unsigned int bytes = io_u->buflen - io_u->resid;
        if (!io_u->error) {
                unsigned int bytes = io_u->buflen - io_u->resid;

-               const int idx = io_u->ddir;
+               const enum fio_ddir idx = io_u->ddir;

 
                td->io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
                td->zone_bytes += bytes;
                td->this_io_bytes[idx] += bytes;
 
 
                td->io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
                td->zone_bytes += bytes;
                td->this_io_bytes[idx] += bytes;
 

-               msec = mtime_since(&io_u->issue_time, &e);
+               io_u->file->last_completed_pos = io_u->offset + io_u->buflen;
+
+               msec = mtime_since(&io_u->issue_time, &icd->time);

 
                add_clat_sample(td, idx, msec);
 
                add_clat_sample(td, idx, msec);

-               add_bw_sample(td, idx);
+               add_bw_sample(td, idx, &icd->time);

 
                if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
                        log_io_piece(td, io_u);
 
                if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
                        log_io_piece(td, io_u);


@@ -337,6 +341,8 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
        struct io_u *io_u;
        int i;
 
        struct io_u *io_u;
        int i;
 

+       fio_gettime(&icd->time, NULL);
+

        icd->error = 0;
        icd->bytes_done[0] = icd->bytes_done[1] = 0;
 
        icd->error = 0;
        icd->bytes_done[0] = icd->bytes_done[1] = 0;