* 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;
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;
}
trace_add_open_close_event(td, fileno, FIO_LOG_OPEN_FILE);
last_fileno = fileno;
}
+
return last_fileno;
}
{
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;
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;
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);
}
} while (1);
- for_each_file(td, f, i)
+ for (i = 0; i < td->files_index; i++) {
+ f = td->files[i];
trace_add_open_close_event(td, f->fileno, FIO_LOG_CLOSE_FILE);
+ }
fifo_free(fifo);
close(fd);
+ 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);