Fix bad sscan() -> scanf() conversion

[fio.git] / blktrace.c

diff --git a/blktrace.c b/blktrace.c
index 64e49f5e4b552d3d4e67dea8ca7eed5dcf6e589e..111619c6c47301bbf1208895c6315ed3497c22f8 100644 (file)
--- a/blktrace.c
+++ b/blktrace.c
@@ -34,6 +34,7 @@ static int refill_fifo(struct thread_data *td, struct fifo *fifo, int fd)
        if (ret > 0)
                ret = fifo_put(fifo, buf, ret);
 
+       dprint(FD_BLKTRACE, "refill: filled %d bytes\n", ret);
        return ret;
 }
 
@@ -62,6 +63,7 @@ static int discard_pdu(struct thread_data *td, struct fifo *fifo, int fd,
        if (t->pdu_len == 0)
                return 0;
 
+       dprint(FD_BLKTRACE, "discard pdu len %u\n", t->pdu_len);
        return trace_fifo_get(td, fifo, fd, NULL, t->pdu_len);
 }
 
@@ -130,6 +132,7 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
                        continue;
 
                if (maj == major(st.st_rdev) && min == minor(st.st_rdev)) {
+                       dprint(FD_BLKTRACE, "device lookup: %d/%d\n", maj, min);
                        strcpy(path, full_path);
                        found = 1;
                        break;
@@ -168,8 +171,10 @@ static void trace_add_file(struct thread_data *td, __u32 device)
                        return;
 
        strcpy(dev, "/dev");
-       if (lookup_device(dev, maj, min))
+       if (lookup_device(dev, maj, min)) {
+               dprint(FD_BLKTRACE, "add devices %s\n", dev);
                add_file(td, dev);
+       }
 }
 
 /*
@@ -193,25 +198,22 @@ static void store_ipo(struct thread_data *td, unsigned long long offset,
        else
                ipo->ddir = DDIR_READ;
 
+       dprint(FD_BLKTRACE, "store ddir=%d, off=%llu, len=%lu, delay=%lu\n",
+                                                       ipo->ddir, ipo->offset,
+                                                       ipo->len, ipo->delay);
        list_add_tail(&ipo->list, &td->io_log_list);
 }
 
-/*
- * We only care for queue traces, most of the others are side effects
- * due to internal workings of the block layer.
- */
-static void handle_trace(struct thread_data *td, struct blk_io_trace *t,
-                        unsigned long long ttime, unsigned long *ios,
-                        unsigned int *bs)
+static void handle_trace_notify(struct thread_data *td, struct blk_io_trace *t)
 {
-       int rw;
+       printf("got notify: %x, %d\n", t->action, t->pid);
+}
 
-       if ((t->action & 0xffff) != __BLK_TA_QUEUE)
-               return;
-       if (t->action & BLK_TC_ACT(BLK_TC_PC))
-               return;
-       if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY))
-               return;
+static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
+                           unsigned long long ttime, unsigned long *ios,
+                           unsigned int *bs)
+{
+       int rw;
 
        trace_add_file(td, t->device);
 
@@ -225,6 +227,25 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t,
        store_ipo(td, t->sector, t->bytes, rw, ttime);
 }
 
+/*
+ * We only care for queue traces, most of the others are side effects
+ * due to internal workings of the block layer.
+ */
+static void handle_trace(struct thread_data *td, struct blk_io_trace *t,
+                        unsigned long long ttime, unsigned long *ios,
+                        unsigned int *bs)
+{
+       if ((t->action & 0xffff) != __BLK_TA_QUEUE)
+               return;
+       if (t->action & BLK_TC_ACT(BLK_TC_PC))
+               return;
+
+       if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY))
+               handle_trace_notify(td, t);
+       else
+               handle_trace_fs(td, t, ttime, ios, bs);
+}
+
 /*
  * Load a blktrace file by reading all the blk_io_trace entries, and storing
  * them as io_pieces like the fio text version would do.
@@ -267,11 +288,13 @@ int load_blktrace(struct thread_data *td, const char *filename)
                }
 
                if ((t.magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) {
-                       log_err("fio: bad magic in blktrace data: %x\n", t.magic);
+                       log_err("fio: bad magic in blktrace data: %x\n",
+                                                               t.magic);
                        goto err;
                }
                if ((t.magic & 0xff) != BLK_IO_TRACE_VERSION) {
-                       log_err("fio: bad blktrace version %d\n", t.magic & 0xff);
+                       log_err("fio: bad blktrace version %d\n",
+                                                               t.magic & 0xff);
                        goto err;
                }
                ret = discard_pdu(td, fifo, fd, &t);
@@ -303,7 +326,8 @@ int load_blktrace(struct thread_data *td, const char *filename)
        close(fd);
 
        if (skipped_writes)
-               log_err("fio: <%s> skips replay of %lu writes due to read-only\n", td->o.name, skipped_writes);
+               log_err("fio: %s skips replay of %lu writes due to read-only\n",
+                                               td->o.name, skipped_writes);
 
        if (!ios[DDIR_READ] && !ios[DDIR_WRITE]) {
                log_err("fio: found no ios in blktrace data\n");