projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
windows: minor windows installer improvements
[fio.git]
/
blktrace.c
diff --git
a/blktrace.c
b/blktrace.c
index 562e126b428389af6db707b5fffde18cc922efb9..4b791d7eb3f1f0b9b23432840ffcb48ef252ed16 100644
(file)
--- a/
blktrace.c
+++ b/
blktrace.c
@@
-10,8
+10,9
@@
#include "flist.h"
#include "fio.h"
#include "flist.h"
#include "fio.h"
+#include "blktrace.h"
#include "blktrace_api.h"
#include "blktrace_api.h"
-#include "lib/linux-dev-lookup.h"
+#include "
os
lib/linux-dev-lookup.h"
#define TRACE_FIFO_SIZE 8192
#define TRACE_FIFO_SIZE 8192
@@
-216,15
+217,6
@@
static void t_bytes_align(struct thread_options *o, struct blk_io_trace *t)
t->bytes = (t->bytes + o->replay_align - 1) & ~(o->replay_align - 1);
}
t->bytes = (t->bytes + o->replay_align - 1) & ~(o->replay_align - 1);
}
-static void ipo_bytes_align(struct thread_options *o, struct io_piece *ipo)
-{
- if (!o->replay_align)
- return;
-
- ipo->offset &= ~(o->replay_align - 1);
-}
-
-
/*
* Store blk_io_trace data in an ipo for later retrieval.
*/
/*
* Store blk_io_trace data in an ipo for later retrieval.
*/
@@
-239,7
+231,7
@@
static void store_ipo(struct thread_data *td, unsigned long long offset,
ipo->offset = offset * bs;
if (td->o.replay_scale)
ipo->offset = ipo->offset / td->o.replay_scale;
ipo->offset = offset * bs;
if (td->o.replay_scale)
ipo->offset = ipo->offset / td->o.replay_scale;
- ipo_bytes_align(
&td->o
, ipo);
+ ipo_bytes_align(
td->o.replay_align
, ipo);
ipo->len = bytes;
ipo->delay = ttime / 1000;
if (rw)
ipo->len = bytes;
ipo->delay = ttime / 1000;
if (rw)
@@
-297,7
+289,7
@@
static void handle_trace_discard(struct thread_data *td,
ipo->offset = t->sector * bs;
if (td->o.replay_scale)
ipo->offset = ipo->offset / td->o.replay_scale;
ipo->offset = t->sector * bs;
if (td->o.replay_scale)
ipo->offset = ipo->offset / td->o.replay_scale;
- ipo_bytes_align(
&td->o
, ipo);
+ ipo_bytes_align(
td->o.replay_align
, ipo);
ipo->len = t->bytes;
ipo->delay = ttime / 1000;
ipo->ddir = DDIR_TRIM;
ipo->len = t->bytes;
ipo->delay = ttime / 1000;
ipo->ddir = DDIR_TRIM;
@@
-508,10
+500,8
@@
int load_blktrace(struct thread_data *td, const char *filename, int need_swap)
handle_trace(td, &t, ios, rw_bs);
} while (1);
handle_trace(td, &t, ios, rw_bs);
} while (1);
- for (i = 0; i < td->files_index; i++) {
- f = td->files[i];
+ for_each_file(td, f, i)
trace_add_open_close_event(td, f->fileno, FIO_LOG_CLOSE_FILE);
trace_add_open_close_event(td, f->fileno, FIO_LOG_CLOSE_FILE);
- }
fifo_free(fifo);
close(fd);
fifo_free(fifo);
close(fd);