Improve random verify block sorting

[fio.git] / log.c

diff --git a/log.c b/log.c
index 2b90f452e8c22bca740b235ebb26094a12892574..45be5fb6fdb94f718d3603bd769226f50abf7802 100644 (file)
--- a/log.c
+++ b/log.c
@@ -43,16 +43,34 @@ void prune_io_piece_log(struct thread_data *td)
  */
 void log_io_piece(struct thread_data *td, struct io_u *io_u)
 {
-       struct rb_node **p = &td->io_hist_tree.rb_node;
-       struct rb_node *parent = NULL;
+       struct rb_node **p, *parent;
        struct io_piece *ipo, *__ipo;
 
        ipo = malloc(sizeof(struct io_piece));
-       memset(&ipo->rb_node, 0, sizeof(ipo->rb_node));
        ipo->file = io_u->file;
        ipo->offset = io_u->offset;
        ipo->len = io_u->buflen;
 
+       /*
+        * We don't need to sort the entries, if:
+        *
+        *      Sequential writes, or
+        *      Random writes that lay out the file as it goes along
+        *
+        * 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)) {
+               INIT_LIST_HEAD(&ipo->list);
+               list_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
         */
@@ -60,12 +78,10 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
                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 if (ipo->offset > __ipo->offset)
-                       p = &(*p)->rb_right;
                else
-                       break;
+                       p = &(*p)->rb_right;
        }
 
        rb_link_node(&ipo->rb_node, parent, p);
@@ -113,7 +129,7 @@ static int init_iolog_read(struct thread_data *td)
                        reads++;
                else if (rw == DDIR_WRITE)
                        writes++;
-               else {
+               else if (rw != DDIR_SYNC) {
                        log_err("bad ddir: %d\n", rw);
                        continue;
                }