Obscure file randommap fix

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index c9a344f27aff5ebcb4a405a34e2da72d0b0b0d4a..fead400cd7c5759d34ad2210f06c5ecee0335145 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -109,6 +109,9 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
                unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
                int loops = 5;
 
+               if (!max_blocks)
+                       return 1;
+
                do {
                        r = os_random_long(&td->random_state);
                        b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
@@ -265,10 +268,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static void io_u_mark_depth(struct thread_data *td)
+void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
 {
        int index = 0;
 
+       if (io_u->ddir == DDIR_SYNC)
+               return;
+
        switch (td->cur_depth) {
        default:
                index++;
@@ -287,7 +293,7 @@ static void io_u_mark_depth(struct thread_data *td)
        }
 
        td->ts.io_u_map[index]++;
-       td->ts.total_io_u++;
+       td->ts.total_io_u[io_u->ddir]++;
 }
 
 static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
@@ -327,17 +333,19 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
 /*
  * Get next file to service by choosing one at random
  */
-static struct fio_file *get_next_file_rand(struct thread_data *td)
+static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
+                                          int badf)
 {
-       unsigned int fileno;
        struct fio_file *f;
+       int fno;
 
        do {
                long r = os_random_long(&td->next_file_state);
 
-               fileno = (unsigned int) ((double) (td->open_files * r) / (RAND_MAX + 1.0));
-               f = &td->files[fileno];
-               if (f->open)
+               fno = (unsigned int) ((double) td->nr_files * (r / (RAND_MAX + 1.0)));
+               f = &td->files[fno];
+
+               if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
                        return f;
        } while (1);
 }
@@ -345,7 +353,8 @@ static struct fio_file *get_next_file_rand(struct thread_data *td)
 /*
  * Get next file to service by doing round robin between all available ones
  */
-static struct fio_file *get_next_file_rr(struct thread_data *td)
+static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
+                                        int badf)
 {
        unsigned int old_next_file = td->next_file;
        struct fio_file *f;
@@ -354,10 +363,10 @@ static struct fio_file *get_next_file_rr(struct thread_data *td)
                f = &td->files[td->next_file];
 
                td->next_file++;
-               if (td->next_file >= td->open_files)
+               if (td->next_file >= td->nr_files)
                        td->next_file = 0;
 
-               if (f->open)
+               if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
                        break;
 
                f = NULL;
@@ -370,23 +379,37 @@ static struct fio_file *get_next_file(struct thread_data *td)
 {
        struct fio_file *f;
 
+       assert(td->nr_files <= td->files_index);
+
        if (!td->nr_open_files)
                return NULL;
 
        f = td->file_service_file;
-       if (f && f->open && td->file_service_left--)
+       if (f && (f->flags & FIO_FILE_OPEN) && td->file_service_left--)
                return f;
 
        if (td->file_service_type == FIO_FSERVICE_RR)
-               f = get_next_file_rr(td);
+               f = get_next_file_rr(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
        else
-               f = get_next_file_rand(td);
+               f = get_next_file_rand(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
 
        td->file_service_file = f;
        td->file_service_left = td->file_service_nr - 1;
        return f;
 }
 
+static struct fio_file *find_next_new_file(struct thread_data *td)
+{
+       struct fio_file *f;
+
+       if (td->file_service_type == FIO_FSERVICE_RR)
+               f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
+       else
+               f = get_next_file_rand(td, 0, FIO_FILE_OPEN);
+
+       return f;
+}
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
        struct io_u *io_u = NULL;
@@ -410,7 +433,6 @@ struct io_u *__get_io_u(struct thread_data *td)
                list_del(&io_u->list);
                list_add(&io_u->list, &td->io_u_busylist);
                td->cur_depth++;
-               io_u_mark_depth(td);
        }
 
        return io_u;
@@ -424,6 +446,7 @@ struct io_u *get_io_u(struct thread_data *td)
 {
        struct fio_file *f;
        struct io_u *io_u;
+       int ret;
 
        io_u = __get_io_u(td);
        if (!io_u)
@@ -442,6 +465,7 @@ struct io_u *get_io_u(struct thread_data *td)
                        return NULL;
                }
 
+set_file:
                io_u->file = f;
 
                if (!fill_io_u(td, io_u))
@@ -459,12 +483,13 @@ struct io_u *get_io_u(struct thread_data *td)
                 */
                if (td->nr_open_files < td->nr_files &&
                    td->open_files != td->nr_files) {
-                       int ret = td_io_open_file(td, f);
+                       f = find_next_new_file(td);
 
-                       if (ret) {
+                       if (!f || (ret = td_io_open_file(td, f))) {
                                put_io_u(td, io_u);
-                               return NULL;
+                               break;
                        }
+                       goto set_file;
                }
        } while (1);
 
@@ -535,6 +560,8 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
        assert(io_u->flags & IO_U_F_FLIGHT);
        io_u->flags &= ~IO_U_F_FLIGHT;
 
+       put_file(td, io_u->file);
+
        if (io_u->ddir == DDIR_SYNC) {
                td->last_was_sync = 1;
                return;