Fio 1.42

[fio.git] / log.c

diff --git a/log.c b/log.c
index 99f20b53083b29ae4399827ff677b89e1d16781f..5fc8f64bef4fde855d9c11e471db35f0d94778f6 100644 (file)
--- a/log.c
+++ b/log.c
@@ -160,12 +160,14 @@ void prune_io_piece_log(struct thread_data *td)
        while ((n = rb_first(&td->io_hist_tree)) != NULL) {
                ipo = rb_entry(n, struct io_piece, rb_node);
                rb_erase(n, &td->io_hist_tree);
+               td->io_hist_len--;
                free(ipo);
        }
 
        while (!flist_empty(&td->io_hist_list)) {
                ipo = flist_entry(td->io_hist_list.next, struct io_piece, list);
                flist_del(&ipo->list);
+               td->io_hist_len--;
                free(ipo);
        }
 }
@@ -201,6 +203,7 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
              (file_randommap(td, ipo->file) || td->o.verify == VERIFY_NONE)) {
                INIT_FLIST_HEAD(&ipo->list);
                flist_add_tail(&ipo->list, &td->io_hist_list);
+               td->io_hist_len++;
                return;
        }
 
@@ -216,12 +219,17 @@ restart:
                parent = *p;
 
                __ipo = rb_entry(parent, struct io_piece, rb_node);
-               if (ipo->offset < __ipo->offset)
+               if (ipo->file < __ipo->file)
+                       p = &(*p)->rb_left;
+               else if (ipo->file > __ipo->file)
+                       p = &(*p)->rb_right;
+               else if (ipo->offset < __ipo->offset)
                        p = &(*p)->rb_left;
                else if (ipo->offset > __ipo->offset)
                        p = &(*p)->rb_right;
                else {
                        assert(ipo->len == __ipo->len);
+                       td->io_hist_len--;
                        rb_erase(parent, &td->io_hist_tree);
                        goto restart;
                }
@@ -229,6 +237,7 @@ restart:
 
        rb_link_node(&ipo->rb_node, parent, p);
        rb_insert_color(&ipo->rb_node, &td->io_hist_tree);
+       td->io_hist_len++;
 }
 
 void write_iolog_close(struct thread_data *td)