idletime: fix another missing unlock on error

[fio.git] / blktrace.c

diff --git a/blktrace.c b/blktrace.c
index e195f7f1fdbf4dea9eff8b252b606273431027a1..29eed50c391c422da566eb063cb2bc4863bd19a1 100644 (file)
--- a/blktrace.c
+++ b/blktrace.c
@@ -71,7 +71,7 @@ static int discard_pdu(struct thread_data *td, struct fifo *fifo, int fd,
  * Check if this is a blktrace binary data file. We read a single trace
  * into memory and check for the magic signature.
  */
-int is_blktrace(const char *filename)
+int is_blktrace(const char *filename, int *need_swap)
 {
        struct blk_io_trace t;
        int fd, ret;
@@ -91,8 +91,19 @@ int is_blktrace(const char *filename)
                return 0;
        }
 
-       if ((t.magic & 0xffffff00) == BLK_IO_TRACE_MAGIC)
+       if ((t.magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+               *need_swap = 0;
                return 1;
+       }
+
+       /*
+        * Maybe it needs to be endian swapped...
+        */
+       t.magic = fio_swap32(t.magic);
+       if ((t.magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+               *need_swap = 1;
+               return 1;
+       }
 
        return 0;
 }
@@ -139,7 +150,7 @@ static int lookup_device(struct thread_data *td, char *path, unsigned int maj,
                 */
                if (td->o.replay_redirect) {
                        dprint(FD_BLKTRACE, "device lookup: %d/%d\n overridden"
-                                       " with: %s", maj, min,
+                                       " with: %s\n", maj, min,
                                        td->o.replay_redirect);
                        strcpy(path, td->o.replay_redirect);
                        found = 1;
@@ -206,9 +217,13 @@ static int trace_add_file(struct thread_data *td, __u32 device)
 
                dprint(FD_BLKTRACE, "add devices %s\n", dev);
                fileno = add_file_exclusive(td, dev);
+               td->o.open_files++;
+               td->files[fileno]->major = maj;
+               td->files[fileno]->minor = min;
                trace_add_open_close_event(td, fileno, FIO_LOG_OPEN_FILE);
                last_fileno = fileno;
        }
+
        return last_fileno;
 }
 
@@ -245,10 +260,12 @@ static void handle_trace_notify(struct blk_io_trace *t)
 {
        switch (t->action) {
        case BLK_TN_PROCESS:
-               printf("got process notify: %x, %d\n", t->action, t->pid);
+               log_info("blktrace: got process notify: %x, %d\n",
+                               t->action, t->pid);
                break;
        case BLK_TN_TIMESTAMP:
-               printf("got timestamp notify: %x, %d\n", t->action, t->pid);
+               log_info("blktrace: got timestamp notify: %x, %d\n",
+                               t->action, t->pid);
                break;
        case BLK_TN_MESSAGE:
                break;
@@ -328,11 +345,26 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t,
                handle_trace_fs(td, t, ttime, ios, bs);
 }
 
+static void byteswap_trace(struct blk_io_trace *t)
+{
+       t->magic = fio_swap32(t->magic);
+       t->sequence = fio_swap32(t->sequence);
+       t->time = fio_swap64(t->time);
+       t->sector = fio_swap64(t->sector);
+       t->bytes = fio_swap32(t->bytes);
+       t->action = fio_swap32(t->action);
+       t->pid = fio_swap32(t->pid);
+       t->device = fio_swap32(t->device);
+       t->cpu = fio_swap32(t->cpu);
+       t->error = fio_swap16(t->error);
+       t->pdu_len = fio_swap16(t->pdu_len);
+}
+
 /*
  * 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.
  */
-int load_blktrace(struct thread_data *td, const char *filename)
+int load_blktrace(struct thread_data *td, const char *filename, int need_swap)
 {
        unsigned long long ttime, delay;
        struct blk_io_trace t;
@@ -340,8 +372,9 @@ int load_blktrace(struct thread_data *td, const char *filename)
        unsigned int cpu;
        unsigned int rw_bs[2];
        struct fifo *fifo;
-       int fd, i;
+       int fd, i, old_state;
        struct fio_file *f;
+       int this_depth, depth;
 
        fd = open(filename, O_RDONLY);
        if (fd < 0) {
@@ -351,6 +384,8 @@ int load_blktrace(struct thread_data *td, const char *filename)
 
        fifo = fifo_alloc(TRACE_FIFO_SIZE);
 
+       old_state = td_bump_runstate(td, TD_SETTING_UP);
+
        td->o.size = 0;
 
        cpu = 0;
@@ -358,6 +393,7 @@ int load_blktrace(struct thread_data *td, const char *filename)
        ios[0] = ios[1] = 0;
        rw_bs[0] = rw_bs[1] = 0;
        skipped_writes = 0;
+       this_depth = depth = 0;
        do {
                int ret = trace_fifo_get(td, fifo, fd, &t, sizeof(t));
 
@@ -370,6 +406,9 @@ int load_blktrace(struct thread_data *td, const char *filename)
                        break;
                }
 
+               if (need_swap)
+                       byteswap_trace(&t);
+
                if ((t.magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) {
                        log_err("fio: bad magic in blktrace data: %x\n",
                                                                t.magic);
@@ -389,6 +428,12 @@ int load_blktrace(struct thread_data *td, const char *filename)
                        goto err;
                }
                if ((t.action & BLK_TC_ACT(BLK_TC_NOTIFY)) == 0) {
+                       if ((t.action & 0xffff) == __BLK_TA_QUEUE)
+                               this_depth++;
+                       else if ((t.action & 0xffff) == __BLK_TA_COMPLETE) {
+                               depth = max(depth, this_depth);
+                               this_depth = 0;
+                       }
                        if (!ttime) {
                                ttime = t.time;
                                cpu = t.cpu;
@@ -419,13 +464,27 @@ int load_blktrace(struct thread_data *td, const char *filename)
        } while (1);
 
        for (i = 0; i < td->files_index; i++) {
-               f= td->files[i];
+               f = td->files[i];
                trace_add_open_close_event(td, f->fileno, FIO_LOG_CLOSE_FILE);
        }
 
        fifo_free(fifo);
        close(fd);
 
+       td_restore_runstate(td, old_state);
+
+       if (!td->files_index) {
+               log_err("fio: did not find replay device(s)\n");
+               return 1;
+       }
+
+       /*
+        * For stacked devices, we don't always get a COMPLETE event so
+        * the depth grows to insane values. Limit it to something sane(r).
+        */
+       if (!depth || depth > 1024)
+               depth = 1024;
+
        if (skipped_writes)
                log_err("fio: %s skips replay of %lu writes due to read-only\n",
                                                td->o.name, skipped_writes);
@@ -451,6 +510,13 @@ int load_blktrace(struct thread_data *td, const char *filename)
         */
        td->o.odirect = 1;
 
+       /*
+        * we don't know if this option was set or not. it defaults to 1,
+        * so we'll just guess that we should override it if it's still 1
+        */
+       if (td->o.iodepth != 1)
+               td->o.iodepth = depth;
+
        return 0;
 err:
        close(fd);