prune_io_piece_log() also needs to take list into account

[fio.git] / log.c

diff --git a/log.c b/log.c
index 92bcebfcca5248961b3bf1dfa74f3240199c5089..8754eb051a1ecfb3ba38290b8d88d5a6bb547c8a 100644 (file)
--- a/log.c
+++ b/log.c
@@ -84,6 +84,9 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
                io_u->file = &td->files[ipo->fileno];
                get_file(io_u->file);
 
+               dprint(FD_IO, "iolog: get %llu/%lu/%s\n", io_u->offset,
+                                       io_u->buflen, io_u->file->file_name);
+
                if (ipo->delay)
                        iolog_delay(td, ipo->delay);
 
@@ -91,6 +94,7 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
                return 0;
        }
 
+       td->done = 1;
        return 1;
 }
 
@@ -104,6 +108,12 @@ void prune_io_piece_log(struct thread_data *td)
                rb_erase(n, &td->io_hist_tree);
                free(ipo);
        }
+
+       while (!list_empty(&td->io_hist_list)) {
+               ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+               list_del(&ipo->list);
+               free(ipo);
+       }
 }
 
 /*
@@ -128,8 +138,7 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
         * For both these cases, just reading back data in the order we
         * wrote it out is the fastest.
         */
-       if (!td_random(td) || !td->o.overwrite ||
-            (io_u->file->flags & FIO_FILE_NOSORT)) {
+       if (!td_random(td) || !td->o.overwrite) {
                INIT_LIST_HEAD(&ipo->list);
                list_add_tail(&ipo->list, &td->io_hist_list);
                return;
@@ -173,9 +182,10 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 {
        unsigned long long offset;
        unsigned int bytes;
-       int rw, reads, writes, fileno = 0, file_action = 0; /* stupid gcc */
+       int reads, writes, fileno = 0, file_action = 0; /* stupid gcc */
        char *fname, *act;
        char *str, *p;
+       enum fio_ddir rw;
 
        free_release_files(td);
 
@@ -231,9 +241,14 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                        
                if (rw == DDIR_READ)
                        reads++;
-               else if (rw == DDIR_WRITE)
+               else if (rw == DDIR_WRITE) {
                        writes++;
-               else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
+                       /*
+                        * Don't add a write for ro mode
+                        */
+                       if (read_only)
+                               continue;
+               } else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
                        log_err("bad ddir: %d\n", rw);
                        continue;
                }
@@ -246,7 +261,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                INIT_LIST_HEAD(&ipo->list);
                ipo->offset = offset;
                ipo->len = bytes;
-               ipo->ddir = (enum fio_ddir) rw;
+               ipo->ddir = rw;
                if (bytes > td->o.max_bs[rw])
                        td->o.max_bs[rw] = bytes;
                if (rw == DDIR_INVAL) {
@@ -254,12 +269,18 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                        ipo->file_action = file_action;
                }
                list_add_tail(&ipo->list, &td->io_log_list);
+               td->total_io_size += bytes;
        }
 
        free(str);
        free(act);
        free(fname);
 
+       if (writes && read_only) {
+               log_err("fio: <%s> skips replay of %d writes due to read-only\n", td->o.name, writes);
+               writes = 0;
+       }
+
        if (!reads && !writes)
                return 1;
        else if (reads && !writes)
@@ -280,7 +301,8 @@ static int read_iolog(struct thread_data *td, FILE *f)
        unsigned long long offset;
        unsigned int bytes;
        char *str, *p;
-       int rw, reads, writes;
+       int reads, writes;
+       int rw;
 
        /*
         * Read in the read iolog and store it, reuse the infrastructure
@@ -297,9 +319,14 @@ static int read_iolog(struct thread_data *td, FILE *f)
                }
                if (rw == DDIR_READ)
                        reads++;
-               else if (rw == DDIR_WRITE)
+               else if (rw == DDIR_WRITE) {
                        writes++;
-               else if (rw != DDIR_SYNC) {
+                       /*
+                        * Don't add a write for ro mode
+                        */
+                       if (read_only)
+                               continue;
+               } else if (rw != DDIR_SYNC) {
                        log_err("bad ddir: %d\n", rw);
                        continue;
                }
@@ -313,10 +340,16 @@ static int read_iolog(struct thread_data *td, FILE *f)
                if (bytes > td->o.max_bs[rw])
                        td->o.max_bs[rw] = bytes;
                list_add_tail(&ipo->list, &td->io_log_list);
+               td->total_io_size += bytes;
        }
 
        free(str);
 
+       if (writes && read_only) {
+               log_err("fio: <%s> skips replay of %d writes due to read-only\n", td->o.name, writes);
+               writes = 0;
+       }
+
        if (!reads && !writes)
                return 1;
        else if (reads && !writes)