Add runstate swap helpers

[fio.git] / blktrace.c

diff --git a/blktrace.c b/blktrace.c
index e195f7f1fdbf4dea9eff8b252b606273431027a1..4b5567effe6ab2624079df36284df4ad524d0f19 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;
 }
@@ -206,9 +217,12 @@ 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->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 +259,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 +344,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,7 +371,7 @@ 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;
 
        fd = open(filename, O_RDONLY);
@@ -351,6 +382,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;
@@ -370,6 +403,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);
@@ -419,13 +455,20 @@ 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;
+       }
+
        if (skipped_writes)
                log_err("fio: %s skips replay of %lu writes due to read-only\n",
                                                td->o.name, skipped_writes);