Revamp file open/close handling

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index ede61a8eae32dfcd34bc5b9022b99f2b05eaad3b..0c604dff8640cde9ae25b000b5f33124c0d9c51e 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -37,10 +37,10 @@ static int random_map_free(struct thread_data *td, struct fio_file *f,
 /*
  * Mark a given offset as used in the map.
  */
-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 io_u *io_u)
 {
        unsigned int min_bs = td->rw_min_bs;
+       struct fio_file *f = io_u->file;
        unsigned long long block;
        unsigned int blocks;
        unsigned int nr_blocks;
@@ -98,16 +98,16 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
  * until we find a free one. For sequential io, just return the end of
  * the last io issued.
  */
-static int get_next_offset(struct thread_data *td, struct fio_file *f,
-                          struct io_u *io_u)
+static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
+       struct fio_file *f = io_u->file;
        const int ddir = io_u->ddir;
        unsigned long long b, rb;
        long r;
 
        if (td_random(td)) {
                unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
-               int loops = 5;
+               int loops = 2;
 
                do {
                        r = os_random_long(&td->random_state);
@@ -134,9 +134,9 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
        return 0;
 }
 
-static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
-                                   struct io_u *io_u)
+static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
+       struct fio_file *f = io_u->file;
        const int ddir = io_u->ddir;
        unsigned int buflen;
        long r;
@@ -220,8 +220,7 @@ void requeue_io_u(struct thread_data *td, struct io_u **io_u)
        *io_u = NULL;
 }
 
-static int fill_io_u(struct thread_data *td, struct fio_file *f,
-                    struct io_u *io_u)
+static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 {
        /*
         * If using an iolog, grab next piece if any available.
@@ -235,7 +234,6 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
        if (td->fsync_blocks && !(td->io_issues[DDIR_WRITE] % td->fsync_blocks)
            && td->io_issues[DDIR_WRITE] && should_fsync(td)) {
                io_u->ddir = DDIR_SYNC;
-               io_u->file = f;
                return 0;
        }
 
@@ -245,10 +243,10 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
         * No log, let the seq/rand engine retrieve the next buflen and
         * position.
         */
-       if (get_next_offset(td, f, io_u))
+       if (get_next_offset(td, io_u))
                return 1;
 
-       io_u->buflen = get_next_buflen(td, f, io_u);
+       io_u->buflen = get_next_buflen(td, io_u);
        if (!io_u->buflen)
                return 1;
 
@@ -256,7 +254,7 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
         * mark entry before potentially trimming io_u
         */
        if (!td->read_iolog && td_random(td) && !td->norandommap)
-               mark_random_map(td, f, io_u);
+               mark_random_map(td, io_u);
 
        /*
         * If using a write iolog, store this entry.
@@ -264,7 +262,6 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
        if (td->write_iolog_file)
                write_iolog_put(td, io_u);
 
-       io_u->file = f;
        return 0;
 }
 
@@ -289,8 +286,8 @@ static void io_u_mark_depth(struct thread_data *td)
                break;
        }
 
-       td->io_u_map[index]++;
-       td->total_io_u++;
+       td->ts.io_u_map[index]++;
+       td->ts.total_io_u++;
 }
 
 static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
@@ -324,7 +321,7 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
                break;
        }
 
-       td->io_u_lat[index]++;
+       td->ts.io_u_lat[index]++;
 }
 
 /*
@@ -332,12 +329,13 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
  */
 static struct fio_file *get_next_file_rand(struct thread_data *td)
 {
-       long r = os_random_long(&td->next_file_state);
        unsigned int fileno;
        struct fio_file *f;
 
        do {
-               fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+               long r = os_random_long(&td->next_file_state);
+
+               fileno = (unsigned int) ((double) (td->open_files - 1) * r / (RAND_MAX + 1.0));
                f = &td->files[fileno];
                if (f->fd != -1)
                        return f;
@@ -356,7 +354,7 @@ 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->nr_files)
+               if (td->next_file >= td->open_files)
                        td->next_file = 0;
 
                if (f->fd != -1)
@@ -368,6 +366,17 @@ static struct fio_file *get_next_file_rr(struct thread_data *td)
        return f;
 }
 
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+       if (!td->nr_open_files)
+               return NULL;
+
+       if (td->file_service_type == FIO_FSERVICE_RR)
+               return get_next_file_rr(td);
+       else
+               return get_next_file_rand(td);
+}
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
        struct io_u *io_u = NULL;
@@ -416,28 +425,38 @@ struct io_u *get_io_u(struct thread_data *td)
        if (io_u->file)
                goto out;
 
-       if (td->file_service_type == FIO_FSERVICE_RR)
-               f = get_next_file_rr(td);
-       else
-               f = get_next_file_rand(td);
+       do {
+               f = get_next_file(td);
+               if (!f) {
+                       put_io_u(td, io_u);
+                       return NULL;
+               }
 
-       if (!f) {
-               put_io_u(td, io_u);
-               return NULL;
-       }
+               io_u->file = f;
 
-       io_u->file = f;
+               if (!fill_io_u(td, io_u))
+                       break;
+
+               /*
+                * No more to do for this file, close it
+                */
+               io_u->file = NULL;
+               td_io_close_file(td, f);
+
+               /*
+                * probably not the right place to do this, but see
+                * if we need to open a new file
+                */
+               if (td->nr_open_files < td->nr_files &&
+                   td->open_files != td->nr_files)
+                       reopen_file(td, f);
+       } while (1);
 
        if (td->zone_bytes >= td->zone_size) {
                td->zone_bytes = 0;
                f->last_pos += td->zone_skip;
        }
 
-       if (fill_io_u(td, f, io_u)) {
-               put_io_u(td, io_u);
-               return NULL;
-       }
-
        if (io_u->buflen + io_u->offset > f->real_file_size) {
                if (td->io_ops->flags & FIO_RAWIO) {
                        put_io_u(td, io_u);
@@ -475,6 +494,23 @@ out:
        return io_u;
 }
 
+void io_u_log_error(struct thread_data *td, struct io_u *io_u)
+{
+       const char *msg[] = { "read", "write", "sync" };
+
+       log_err("fio: io_u error");
+
+       if (io_u->file)
+               log_err(" on file %s", io_u->file->file_name);
+
+       log_err(": %s\n", strerror(io_u->error));
+
+       log_err("     %s offset=%llu, buflen=%lu\n", msg[io_u->ddir], io_u->offset, io_u->xfer_buflen);
+
+       if (!td->error)
+               td_verror(td, io_u->error, "io_u error");
+}
+
 static void io_completed(struct thread_data *td, struct io_u *io_u,
                         struct io_completion_data *icd)
 {
@@ -518,8 +554,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                        if (ret && !icd->error)
                                icd->error = ret;
                }
-       } else
+       } else {
                icd->error = io_u->error;
+               io_u_log_error(td, io_u);
+       }
 }
 
 static void init_icd(struct io_completion_data *icd, int nr)
@@ -560,6 +598,7 @@ long io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
        if (!icd.error)
                return icd.bytes_done[0] + icd.bytes_done[1];
 
+       td_verror(td, icd.error, "io_u_sync_complete");
        return -1;
 }
 
@@ -590,6 +629,7 @@ long io_u_queued_complete(struct thread_data *td, int min_events)
        if (!icd.error)
                return icd.bytes_done[0] + icd.bytes_done[1];
 
+       td_verror(td, icd.error, "io_u_queued_complete");
        return -1;
 }