The blktrace format is stored in the native endianness of
the machine it is run on. So to reply traces on a machine
with a different endianness, we need to swap the trace
fields. Detect and do this automatically.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
* Check if this is a blktrace binary data file. We read a single trace
* into memory and check for the magic signature.
*/
* 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;
{
struct blk_io_trace t;
int fd, ret;
- if ((t.magic & 0xffffff00) == BLK_IO_TRACE_MAGIC)
+ if ((t.magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+ *need_swap = 0;
+ }
+
+ /*
+ * 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;
+ }
{
switch (t->action) {
case BLK_TN_PROCESS:
{
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:
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;
break;
case BLK_TN_MESSAGE:
break;
handle_trace_fs(td, t, ttime, ios, bs);
}
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.
*/
/*
* 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;
{
unsigned long long ttime, delay;
struct blk_io_trace t;
+ 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);
if ((t.magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) {
log_err("fio: bad magic in blktrace data: %x\n",
t.magic);
* blktrace support
*/
#ifdef FIO_HAVE_BLKTRACE
* blktrace support
*/
#ifdef FIO_HAVE_BLKTRACE
-extern int is_blktrace(const char *);
-extern int load_blktrace(struct thread_data *, const char *);
+extern int is_blktrace(const char *, int *);
+extern int load_blktrace(struct thread_data *, const char *, int);
#endif
#define for_each_td(td, i) \
#endif
#define for_each_td(td, i) \
int ret = 0;
if (td->o.read_iolog_file) {
int ret = 0;
if (td->o.read_iolog_file) {
/*
* Check if it's a blktrace file and load that if possible.
* Otherwise assume it's a normal log file and load that.
*/
/*
* Check if it's a blktrace file and load that if possible.
* Otherwise assume it's a normal log file and load that.
*/
- if (is_blktrace(td->o.read_iolog_file))
- ret = load_blktrace(td, td->o.read_iolog_file);
+ if (is_blktrace(td->o.read_iolog_file, &need_swap))
+ ret = load_blktrace(td, td->o.read_iolog_file, need_swap);
else
ret = init_iolog_read(td);
} else if (td->o.write_iolog_file)
else
ret = init_iolog_read(td);
} else if (td->o.write_iolog_file)
})
#ifndef FIO_HAVE_BLKTRACE
})
#ifndef FIO_HAVE_BLKTRACE
-static inline int is_blktrace(const char *fname)
+static inline int is_blktrace(const char *fname, int *need_swap)
{
return 0;
}
struct thread_data;
{
return 0;
}
struct thread_data;
-static inline int load_blktrace(struct thread_data *td, const char *fname)
+static inline int load_blktrace(struct thread_data *td, const char *fname,
+ int need_swap)