projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extend --readonly
[fio.git]
/
blktrace.c
diff --git
a/blktrace.c
b/blktrace.c
index 629aebed84d7b40ebcb58942f1383a6a8b0bdfae..64e49f5e4b552d3d4e67dea8ca7eed5dcf6e589e 100644
(file)
--- a/
blktrace.c
+++ b/
blktrace.c
@@
-75,10
+75,8
@@
int is_blktrace(const char *filename)
int fd, ret;
fd = open(filename, O_RDONLY);
int fd, ret;
fd = open(filename, O_RDONLY);
- if (fd < 0) {
- perror("open blktrace");
+ if (fd < 0)
return 0;
return 0;
- }
ret = read(fd, &t, sizeof(t));
close(fd);
ret = read(fd, &t, sizeof(t));
close(fd);
@@
-142,16
+140,16
@@
static int lookup_device(char *path, unsigned int maj, unsigned int min)
return found;
}
return found;
}
-#define
MINORBITS
20
-#define
MINORMASK ((1U <<
MINORBITS) - 1)
-#define
MAJOR(dev) ((unsigned int) ((dev) >>
MINORBITS))
-#define
MINOR(dev) ((unsigned int) ((dev) &
MINORMASK))
+#define
FMINORBITS
20
+#define
FMINORMASK ((1U << F
MINORBITS) - 1)
+#define
FMAJOR(dev) ((unsigned int) ((dev) >> F
MINORBITS))
+#define
FMINOR(dev) ((unsigned int) ((dev) & F
MINORMASK))
static void trace_add_file(struct thread_data *td, __u32 device)
{
static unsigned int last_maj, last_min;
static void trace_add_file(struct thread_data *td, __u32 device)
{
static unsigned int last_maj, last_min;
- unsigned int maj = MAJOR(device);
- unsigned int min = MINOR(device);
+ unsigned int maj =
F
MAJOR(device);
+ unsigned int min =
F
MINOR(device);
struct fio_file *f;
char dev[256];
unsigned int i;
struct fio_file *f;
char dev[256];
unsigned int i;
@@
-235,7
+233,7
@@
int load_blktrace(struct thread_data *td, const char *filename)
{
unsigned long long ttime, delay;
struct blk_io_trace t;
{
unsigned long long ttime, delay;
struct blk_io_trace t;
- unsigned long ios[2];
+ unsigned long ios[2]
, skipped_writes
;
unsigned int cpu;
unsigned int rw_bs[2];
struct fifo *fifo;
unsigned int cpu;
unsigned int rw_bs[2];
struct fifo *fifo;
@@
-255,6
+253,7
@@
int load_blktrace(struct thread_data *td, const char *filename)
ttime = 0;
ios[0] = ios[1] = 0;
rw_bs[0] = rw_bs[1] = 0;
ttime = 0;
ios[0] = ios[1] = 0;
rw_bs[0] = rw_bs[1] = 0;
+ skipped_writes = 0;
do {
int ret = trace_fifo_get(td, fifo, fd, &t, sizeof(t));
do {
int ret = trace_fifo_get(td, fifo, fd, &t, sizeof(t));
@@
-283,6
+282,8
@@
int load_blktrace(struct thread_data *td, const char *filename)
log_err("fio: discarded %d of %d\n", ret, t.pdu_len);
goto err;
}
log_err("fio: discarded %d of %d\n", ret, t.pdu_len);
goto err;
}
+ if (t.action & BLK_TC_ACT(BLK_TC_NOTIFY))
+ continue;
if (!ttime) {
ttime = t.time;
cpu = t.cpu;
if (!ttime) {
ttime = t.time;
cpu = t.cpu;
@@
-290,7
+291,10
@@
int load_blktrace(struct thread_data *td, const char *filename)
delay = 0;
if (cpu == t.cpu)
delay = t.time - ttime;
delay = 0;
if (cpu == t.cpu)
delay = t.time - ttime;
- handle_trace(td, &t, delay, ios, rw_bs);
+ if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only)
+ skipped_writes++;
+ else
+ handle_trace(td, &t, delay, ios, rw_bs);
ttime = t.time;
cpu = t.cpu;
} while (1);
ttime = t.time;
cpu = t.cpu;
} while (1);
@@
-298,6
+302,9
@@
int load_blktrace(struct thread_data *td, const char *filename)
fifo_free(fifo);
close(fd);
fifo_free(fifo);
close(fd);
+ if (skipped_writes)
+ log_err("fio: <%s> skips replay of %lu writes due to read-only\n", td->o.name, skipped_writes);
+
if (!ios[DDIR_READ] && !ios[DDIR_WRITE]) {
log_err("fio: found no ios in blktrace data\n");
return 1;
if (!ios[DDIR_READ] && !ios[DDIR_WRITE]) {
log_err("fio: found no ios in blktrace data\n");
return 1;