Requeue io_u flags fix

[fio.git] / log.c

diff --git a/log.c b/log.c
index 8d313ec65419ef926f560d762d88eb4996341379..6de98ac2900a9bdb0a92dc571d77e188fa140b10 100644 (file)
--- a/log.c
+++ b/log.c
@@ -5,7 +5,7 @@
 
 void write_iolog_put(struct thread_data *td, struct io_u *io_u)
 {
 
 void write_iolog_put(struct thread_data *td, struct io_u *io_u)
 {

-       fprintf(td->iolog_f, "%d,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
+       fprintf(td->iolog_f, "%u,%llu,%lu\n", io_u->ddir, io_u->offset, io_u->buflen);

 }
 
 int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 }
 
 int read_iolog_get(struct thread_data *td, struct io_u *io_u)


@@ -18,6 +18,7 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
                io_u->offset = ipo->offset;
                io_u->buflen = ipo->len;
                io_u->ddir = ipo->ddir;
                io_u->offset = ipo->offset;
                io_u->buflen = ipo->len;
                io_u->ddir = ipo->ddir;

+               io_u->file = ipo->file;

                free(ipo);
                return 0;
        }
                free(ipo);
                return 0;
        }


@@ -46,6 +47,7 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
        struct list_head *entry;
 
        INIT_LIST_HEAD(&ipo->list);
        struct list_head *entry;
 
        INIT_LIST_HEAD(&ipo->list);

+       ipo->file = io_u->file;

        ipo->offset = io_u->offset;
        ipo->len = io_u->buflen;
 
        ipo->offset = io_u->offset;
        ipo->len = io_u->buflen;
 


@@ -54,7 +56,7 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
         * be laid out with the block scattered as written. it's faster to
         * read them in in that order again, so don't sort
         */
         * be laid out with the block scattered as written. it's faster to
         * read them in in that order again, so don't sort
         */

-       if (td->sequential || !td->overwrite) {
+       if (!td_random(td) || !td->overwrite) {

                list_add_tail(&ipo->list, &td->io_hist_list);
                return;
        }
                list_add_tail(&ipo->list, &td->io_hist_list);
                return;
        }


@@ -80,49 +82,34 @@ void write_iolog_close(struct thread_data *td)
        free(td->iolog_buf);
 }
 
        free(td->iolog_buf);
 }
 

-int init_iolog(struct thread_data *td)
+/*
+ * Open a stored log and read in the entries.
+ */
+static int init_iolog_read(struct thread_data *td)

 {
        unsigned long long offset;
        unsigned int bytes;
        char *str, *p;
        FILE *f;
 {
        unsigned long long offset;
        unsigned int bytes;
        char *str, *p;
        FILE *f;

-       int rw, i, reads, writes;
-
-       if (!td->read_iolog && !td->write_iolog)
-               return 0;
-
-       if (td->read_iolog)
-               f = fopen(td->iolog_file, "r");
-       else
-               f = fopen(td->iolog_file, "w");
+       int rw, reads, writes;

 
 

+       f = fopen(td->read_iolog_file, "r");

        if (!f) {
        if (!f) {

-               perror("fopen iolog");
-               printf("file %s, %d/%d\n", td->iolog_file, td->read_iolog, td->write_iolog);
+               perror("fopen read 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);
        /*
         * Read in the read iolog and store it, reuse the infrastructure
         * for doing verifications.
         */
        str = malloc(4096);

-       reads = writes = i = 0;
+       reads = writes = 0;

        while ((p = fgets(str, 4096, f)) != NULL) {
                struct io_piece *ipo;
 
                if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {
        while ((p = fgets(str, 4096, f)) != NULL) {
                struct io_piece *ipo;
 
                if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {

-                       fprintf(stderr, "bad iolog: %s\n", p);
+                       log_err("bad iolog: %s\n", p);

                        continue;
                }
                if (rw == DDIR_READ)
                        continue;
                }
                if (rw == DDIR_READ)


@@ -130,7 +117,7 @@ int init_iolog(struct thread_data *td)
                else if (rw == DDIR_WRITE)
                        writes++;
                else {
                else if (rw == DDIR_WRITE)
                        writes++;
                else {

-                       fprintf(stderr, "bad ddir: %d\n", rw);
+                       log_err("bad ddir: %d\n", rw);

                        continue;
                }
 
                        continue;
                }
 


@@ -138,43 +125,93 @@ int init_iolog(struct thread_data *td)
                INIT_LIST_HEAD(&ipo->list);
                ipo->offset = offset;
                ipo->len = bytes;
                INIT_LIST_HEAD(&ipo->list);
                ipo->offset = offset;
                ipo->len = bytes;

-               if (bytes > td->max_bs)
-                       td->max_bs = bytes;
-               ipo->ddir = rw;
+               ipo->ddir = (enum fio_ddir) rw;
+               if (bytes > td->max_bs[rw])
+                       td->max_bs[rw] = bytes;

                list_add_tail(&ipo->list, &td->io_log_list);
                list_add_tail(&ipo->list, &td->io_log_list);

-               i++;

        }
 
        free(str);
        fclose(f);
 
        }
 
        free(str);
        fclose(f);
 

-       if (!i)
+       if (!reads && !writes)

                return 1;
                return 1;

-
-       if (reads && !writes)
-               td->ddir = DDIR_READ;
+       else if (reads && !writes)
+               td->td_ddir = TD_DDIR_READ;

        else if (!reads && writes)
        else if (!reads && writes)

-               td->ddir = DDIR_READ;
+               td->td_ddir = TD_DDIR_READ;

        else
        else

-               td->iomix = 1;
+               td->td_ddir = TD_DDIR_RW;

 
        return 0;
 }
 
 
        return 0;
 }
 

+/*
+ * Setup a log for storing io patterns.
+ */
+static int init_iolog_write(struct thread_data *td)
+{
+       FILE *f;
+
+       f = fopen(td->write_iolog_file, "w+");
+       if (!f) {
+               perror("fopen write iolog");
+               return 1;
+       }
+
+       /*
+        * That's it for writing, setup a log buffer and we're done.
+         */
+       td->iolog_f = f;
+       td->iolog_buf = malloc(8192);
+       setvbuf(f, td->iolog_buf, _IOFBF, 8192);
+       return 0;
+}
+
+int init_iolog(struct thread_data *td)
+{
+       int ret = 0;
+
+       if (td->io_ops->flags & FIO_CPUIO)
+               return 0;
+
+       if (td->read_iolog_file)
+               ret = init_iolog_read(td);
+       else if (td->write_iolog_file)
+               ret = init_iolog_write(td);
+
+       return ret;
+}
+

 int setup_rate(struct thread_data *td)
 {
 int setup_rate(struct thread_data *td)
 {

-       int nr_reads_per_sec;
+       unsigned long long rate;
+       int nr_reads_per_msec;
+       unsigned int bs;

 
        if (!td->rate)
                return 0;
 
        if (td->rate < td->ratemin) {
 
        if (!td->rate)
                return 0;
 
        if (td->rate < td->ratemin) {

-               fprintf(stderr, "min rate larger than nominal rate\n");
+               log_err("min rate larger than nominal rate\n");

                return -1;
        }
 
                return -1;
        }
 

-       nr_reads_per_sec = (td->rate * 1024) / td->min_bs;
-       td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
+       if (td_rw(td))
+               bs = td->rw_min_bs;
+       else if (td_read(td))
+               bs = td->min_bs[DDIR_READ];
+       else
+               bs = td->min_bs[DDIR_WRITE];
+
+       rate = td->rate;
+       nr_reads_per_msec = (rate * 1024 * 1000) / bs;
+       if (!nr_reads_per_msec) {
+               log_err("rate lower than supported\n");
+               return -1;
+       }
+
+       td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec;

        td->rate_pending_usleep = 0;
        return 0;
 }
        td->rate_pending_usleep = 0;
        return 0;
 }


@@ -189,14 +226,12 @@ void setup_log(struct io_log **log)
        *log = l;
 }
 
        *log = l;
 }
 

-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+void __finish_log(struct io_log *log, const char *name)

 {
 {

-       char file_name[256];
-       FILE *f;

        unsigned int i;
        unsigned int i;

+       FILE *f;

 
 

-       snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
-       f = fopen(file_name, "w");
+       f = fopen(name, "w");

        if (!f) {
                perror("fopen log");
                return;
        if (!f) {
                perror("fopen log");
                return;


@@ -209,3 +244,11 @@ void finish_log(struct thread_data *td, struct io_log *log, const char *name)
        free(log->log);
        free(log);
 }
        free(log->log);
        free(log);
 }

+
+void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+{
+       char file_name[256];
+
+       snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
+       __finish_log(log, file_name);
+}