Merge branch 'master' of git://github.com/cvubrugier/fio

[fio.git] / iolog.c

diff --git a/iolog.c b/iolog.c
index 1af31cb3bd30804f4754c48b9f841fd7006736f9..cac1aba21e8bb5b2b53a4e957ebebfd0a13eaf1a 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -58,6 +58,7 @@ void log_file(struct thread_data *td, struct fio_file *f,
 static void iolog_delay(struct thread_data *td, unsigned long delay)
 {
        unsigned long usec = utime_since_now(&td->last_issue);
+       unsigned long this_delay;
 
        if (delay < usec)
                return;
@@ -70,7 +71,14 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
        if (delay < 100)
                return;
 
-       usec_sleep(td, delay);
+       while (delay && !td->terminate) {
+               this_delay = delay;
+               if (this_delay > 500000)
+                       this_delay = 500000;
+
+               usec_sleep(td, this_delay);
+               delay -= this_delay;
+       }
 }
 
 static int ipo_special(struct thread_data *td, struct io_piece *ipo)
@@ -260,6 +268,33 @@ restart:
        td->io_hist_len++;
 }
 
+void unlog_io_piece(struct thread_data *td, struct io_u *io_u)
+{
+       struct io_piece *ipo = io_u->ipo;
+
+       if (!ipo)
+               return;
+
+       if (ipo->flags & IP_F_ONRB)
+               rb_erase(&ipo->rb_node, &td->io_hist_tree);
+       else if (ipo->flags & IP_F_ONLIST)
+               flist_del(&ipo->list);
+
+       free(ipo);
+       io_u->ipo = NULL;
+       td->io_hist_len--;
+}
+
+void trim_io_piece(struct thread_data *td, struct io_u *io_u)
+{
+       struct io_piece *ipo = io_u->ipo;
+
+       if (!ipo)
+               return;
+
+       ipo->len = io_u->xfer_buflen - io_u->resid;
+}
+
 void write_iolog_close(struct thread_data *td)
 {
        fflush(td->iolog_f);
@@ -371,7 +406,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                } else {
                        ipo->offset = offset;
                        ipo->len = bytes;
-                       if (bytes > td->o.max_bs[rw])
+                       if (rw != DDIR_INVAL && bytes > td->o.max_bs[rw])
                                td->o.max_bs[rw] = bytes;
                        ipo->fileno = fileno;
                        ipo->file_action = file_action;
@@ -516,9 +551,36 @@ void setup_log(struct io_log **log, unsigned long avg_msec, int log_type)
        *log = l;
 }
 
+#ifdef CONFIG_SETVBUF
+static void *set_file_buffer(FILE *f)
+{
+       size_t size = 1048576;
+       void *buf;
+
+       buf = malloc(size);
+       setvbuf(f, buf, _IOFBF, size);
+       return buf;
+}
+
+static void clear_file_buffer(void *buf)
+{
+       free(buf);
+}
+#else
+static void *set_file_buffer(FILE *f)
+{
+       return NULL;
+}
+
+static void clear_file_buffer(void *buf)
+{
+}
+#endif
+
 void __finish_log(struct io_log *log, const char *name)
 {
        unsigned int i;
+       void *buf;
        FILE *f;
 
        f = fopen(name, "a");
@@ -527,6 +589,8 @@ void __finish_log(struct io_log *log, const char *name)
                return;
        }
 
+       buf = set_file_buffer(f);
+
        for (i = 0; i < log->nr_samples; i++) {
                fprintf(f, "%lu, %lu, %u, %u\n",
                                (unsigned long) log->log[i].time,
@@ -535,6 +599,7 @@ void __finish_log(struct io_log *log, const char *name)
        }
 
        fclose(f);
+       clear_file_buffer(buf);
        free(log->log);
        free(log);
 }
@@ -628,7 +693,6 @@ enum {
        CLAT_LOG_MASK   = 8,
        IOPS_LOG_MASK   = 16,
 
-       ALL_LOG_MASK    = 31,
        ALL_LOG_NR      = 5,
 };
 
@@ -662,7 +726,7 @@ static struct log_type log_types[] = {
 
 void fio_writeout_logs(struct thread_data *td)
 {
-       unsigned int log_mask = ALL_LOG_MASK;
+       unsigned int log_mask = 0;
        unsigned int log_left = ALL_LOG_NR;
        int old_state, i;
 
@@ -677,11 +741,11 @@ void fio_writeout_logs(struct thread_data *td)
                        struct log_type *lt = &log_types[i];
                        int ret;
 
-                       if (log_mask & lt->mask) {
+                       if (!(log_mask & lt->mask)) {
                                ret = lt->fn(td, log_left != 1);
                                if (!ret) {
                                        log_left--;
-                                       log_mask &= ~lt->mask;
+                                       log_mask |= lt->mask;
                                }
                        }
                }