[PATCH] Add write_iolog support

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 51cd153552596558d5d879f5136eb18eb1fc9436..695d754976e8c82fa7ae4edc323a505b057ff9ad 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -628,17 +628,16 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
        td->cur_depth--;
 }
 
        td->cur_depth--;
 }
 

-static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+static void write_iolog_put(struct thread_data *td, struct io_u *io_u)

 {
 {

-       /*
-        * If using an iolog, grab next piece if any available.
-        */
-       if (td->iolog) {
-               struct io_piece *ipo;
+       fprintf(td->iolog_f, "%d,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
+}

 
 

-               if (list_empty(&td->io_log_list))
-                       return 1;
+static int read_iolog_get(struct thread_data *td, struct io_u *io_u)
+{
+       struct io_piece *ipo;

 
 

+       if (!list_empty(&td->io_log_list)) {

                ipo = list_entry(td->io_log_list.next, struct io_piece, list);
                list_del(&ipo->list);
                io_u->offset = ipo->offset;
                ipo = list_entry(td->io_log_list.next, struct io_piece, list);
                list_del(&ipo->list);
                io_u->offset = ipo->offset;


@@ -648,6 +647,17 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
                return 0;
        }
 
                return 0;
        }
 

+       return 1;
+}
+
+static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+{
+       /*
+        * If using an iolog, grab next piece if any available.
+        */
+       if (td->read_iolog)
+               return read_iolog_get(td, io_u);
+

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


@@ -656,6 +666,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 
                if (io_u->buflen) {
                        io_u->ddir = get_rw_ddir(td);
 
                if (io_u->buflen) {
                        io_u->ddir = get_rw_ddir(td);

+
+                       /*
+                        * If using a write iolog, store this entry.
+                        */
+                       if (td->write_iolog)
+                               write_iolog_put(td, io_u);
+

                        return 0;
                }
        }
                        return 0;
                }
        }


@@ -707,7 +724,7 @@ static struct io_u *get_io_u(struct thread_data *td)
                return NULL;
        }
 
                return NULL;
        }
 

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

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


@@ -795,6 +812,13 @@ static void log_io_piece(struct thread_data *td, struct io_u *io_u)
        list_add(&ipo->list, entry);
 }
 
        list_add(&ipo->list, entry);
 }
 

+static void write_iolog_close(struct thread_data *td)
+{
+       fflush(td->iolog_f);
+       fclose(td->iolog_f);
+       free(td->iolog_buf);
+}
+

 static int init_iolog(struct thread_data *td)
 {
        unsigned long long offset;
 static int init_iolog(struct thread_data *td)
 {
        unsigned long long offset;


@@ -803,15 +827,34 @@ static int init_iolog(struct thread_data *td)
        FILE *f;
        int rw, i, reads, writes;
 
        FILE *f;
        int rw, i, reads, writes;
 

-       if (!td->iolog)
+       if (!td->read_iolog && !td->write_iolog)

                return 0;
 
                return 0;
 

-       f = fopen(td->iolog_file, "r");
+       if (td->read_iolog)
+               f = fopen(td->iolog_file, "r");
+       else
+               f = fopen(td->iolog_file, "w");
+

        if (!f) {
                perror("fopen iolog");
        if (!f) {
                perror("fopen iolog");

+               printf("file %s, %d/%d\n", td->iolog_file, td->read_iolog, td->write_iolog);

                return 1;
        }
 
                return 1;
        }
 

+       /*
+        * That's it for writing, setup a log buffer and we're done.
+         */
+       if (td->write_iolog) {
+               td->iolog_f = f;
+               td->iolog_buf = malloc(8192);
+               setvbuf(f, td->iolog_buf, _IOFBF, 8192);
+               return 0;
+       }
+
+       /*
+        * Read in the read iolog and store it, reuse the infrastructure
+        * for doing verifications.
+        */

        str = malloc(4096);
        reads = writes = i = 0;
        while ((p = fgets(str, 4096, f)) != NULL) {
        str = malloc(4096);
        reads = writes = i = 0;
        while ((p = fgets(str, 4096, f)) != NULL) {


@@ -1837,6 +1880,7 @@ static void *thread_main(void *data)
        td_set_runstate(td, TD_INITIALIZED);
        sem_post(&startup_sem);
        sem_wait(&td->mutex);
        td_set_runstate(td, TD_INITIALIZED);
        sem_post(&startup_sem);
        sem_wait(&td->mutex);

+       ret = 0;

 
        if (!td->create_serialize && setup_file(td))
                goto err;
 
        if (!td->create_serialize && setup_file(td))
                goto err;


@@ -1879,14 +1923,14 @@ static void *thread_main(void *data)
                        break;
        }
 
                        break;
        }
 

-       ret = 0;
-

        if (td->bw_log)
                finish_log(td, td->bw_log, "bw");
        if (td->slat_log)
                finish_log(td, td->slat_log, "slat");
        if (td->clat_log)
                finish_log(td, td->clat_log, "clat");
        if (td->bw_log)
                finish_log(td, td->bw_log, "bw");
        if (td->slat_log)
                finish_log(td, td->slat_log, "slat");
        if (td->clat_log)
                finish_log(td, td->clat_log, "clat");

+       if (td->write_iolog)
+               write_iolog_close(td);

 
        if (exitall_on_terminate)
                terminate_threads(td->groupid);
 
        if (exitall_on_terminate)
                terminate_threads(td->groupid);