Add strong madvise() hint for cache pruning

[fio.git] / log.c

diff --git a/log.c b/log.c
index 8f92e93f065d7b57234bbdbccf8bab875f785fe9..c44d8221ee936c4c0d235c87efa0f7607eca8dc7 100644 (file)
--- a/log.c
+++ b/log.c
@@ -4,21 +4,23 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <libgen.h>
 #include <assert.h>
-#include "list.h"
+#include "flist.h"
 #include "fio.h"
+#include "verify.h"
 
 static const char iolog_ver2[] = "fio version 2 iolog";
 
 void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
 {
-       list_add_tail(&ipo->list, &td->io_log_list);
+       flist_add_tail(&ipo->list, &td->io_log_list);
        td->total_io_size += ipo->len;
 }
 
 void log_io_u(struct thread_data *td, struct io_u *io_u)
 {
-       const char *act[] = { "read", "write", "sync" };
+       const char *act[] = { "read", "write", "sync", "datasync" };
 
        assert(io_u->ddir < 3);
 
@@ -108,11 +110,11 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 {
        struct io_piece *ipo;
 
-       while (!list_empty(&td->io_log_list)) {
+       while (!flist_empty(&td->io_log_list)) {
                int ret;
 
-               ipo = list_entry(td->io_log_list.next, struct io_piece, list);
-               list_del(&ipo->list);
+               ipo = flist_entry(td->io_log_list.next, struct io_piece, list);
+               flist_del(&ipo->list);
 
                ret = ipo_special(td, ipo);
                if (ret < 0) {
@@ -154,9 +156,9 @@ void prune_io_piece_log(struct thread_data *td)
                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);
+       while (!flist_empty(&td->io_hist_list)) {
+               ipo = flist_entry(td->io_hist_list.next, struct io_piece, list);
+               flist_del(&ipo->list);
                free(ipo);
        }
 }
@@ -182,28 +184,40 @@ 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.
+        *
+        * One exception is if we don't have a random map AND we are doing
+        * verifies, in that case we need to check for duplicate blocks and
+        * drop the old one, which we rely on the rb insert/lookup for
+        * handling.
         */
-       if (!td_random(td) || !td->o.overwrite) {
-               INIT_LIST_HEAD(&ipo->list);
-               list_add_tail(&ipo->list, &td->io_hist_list);
+       if ((!td_random(td) || !td->o.overwrite) &&
+             (file_randommap(td, ipo->file) || td->o.verify == VERIFY_NONE)) {
+               INIT_FLIST_HEAD(&ipo->list);
+               flist_add_tail(&ipo->list, &td->io_hist_list);
                return;
        }
 
        RB_CLEAR_NODE(&ipo->rb_node);
-       p = &td->io_hist_tree.rb_node;
-       parent = NULL;
 
        /*
         * Sort the entry into the verification list
         */
+restart:
+       p = &td->io_hist_tree.rb_node;
+       parent = NULL;
        while (*p) {
                parent = *p;
 
                __ipo = rb_entry(parent, struct io_piece, rb_node);
-               if (ipo->offset <= __ipo->offset)
+               if (ipo->offset < __ipo->offset)
                        p = &(*p)->rb_left;
-               else
+               else if (ipo->offset > __ipo->offset)
                        p = &(*p)->rb_right;
+               else {
+                       assert(ipo->len == __ipo->len);
+                       rb_erase(parent, &td->io_hist_tree);
+                       goto restart;
+               }
        }
 
        rb_link_node(&ipo->rb_node, parent, p);
@@ -259,6 +273,8 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                                rw = DDIR_WRITE;
                        else if (!strcmp(act, "sync"))
                                rw = DDIR_SYNC;
+                       else if (!strcmp(act, "datasync"))
+                               rw = DDIR_DATASYNC;
                        else {
                                log_err("fio: bad iolog file action: %s\n",
                                                                        act);
@@ -296,7 +312,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                        if (read_only)
                                continue;
                        writes++;
-               } else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
+               } else if (!ddir_sync(rw)) {
                        log_err("bad ddir: %d\n", rw);
                        continue;
                }
@@ -306,7 +322,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                 */
                ipo = malloc(sizeof(*ipo));
                memset(ipo, 0, sizeof(*ipo));
-               INIT_LIST_HEAD(&ipo->list);
+               INIT_FLIST_HEAD(&ipo->list);
                ipo->offset = offset;
                ipo->len = bytes;
                ipo->ddir = rw;
@@ -387,7 +403,7 @@ static int init_iolog_write(struct thread_data *td)
        FILE *f;
        unsigned int i;
 
-       f = fopen(td->o.write_iolog_file, "w+");
+       f = fopen(td->o.write_iolog_file, "a");
        if (!f) {
                perror("fopen write iolog");
                return 1;
@@ -421,9 +437,6 @@ int init_iolog(struct thread_data *td)
 {
        int ret = 0;
 
-       if (td->io_ops->flags & FIO_DISKLESSIO)
-               return 0;
-
        if (td->o.read_iolog_file) {
                /*
                 * Check if it's a blktrace file and load that if possible.
@@ -454,15 +467,17 @@ void __finish_log(struct io_log *log, const char *name)
        unsigned int i;
        FILE *f;
 
-       f = fopen(name, "w");
+       f = fopen(name, "a");
        if (!f) {
                perror("fopen log");
                return;
        }
 
        for (i = 0; i < log->nr_samples; i++) {
-               fprintf(f, "%lu, %lu, %u\n", log->log[i].time, log->log[i].val,
-                                               log->log[i].ddir);
+               fprintf(f, "%lu, %lu, %u, %u\n", log->log[i].time,
+                                               log->log[i].val,
+                                               log->log[i].ddir,
+                                               log->log[i].bs);
        }
 
        fclose(f);
@@ -470,11 +485,17 @@ void __finish_log(struct io_log *log, const char *name)
        free(log);
 }
 
-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+void finish_log_named(struct thread_data *td, struct io_log *log,
+                      const char *prefix, const char *postfix)
 {
        char file_name[256], *p;
 
-       snprintf(file_name, 200, "%s_%s.log", td->o.name, name);
+       snprintf(file_name, 200, "%s_%s.log", prefix, postfix);
        p = basename(file_name);
        __finish_log(log, p);
 }
+
+void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+{
+       finish_log_named(td, log, td->o.name, name);
+}