*/
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
+#include <dirent.h>
#include "list.h"
#include "fio.h"
int fd, ret;
fd = open(filename, O_RDONLY);
- if (fd < 0) {
- perror("open blktrace");
+ if (fd < 0)
return 0;
- }
ret = read(fd, &t, sizeof(t));
close(fd);
return 0;
}
+static int lookup_device(char *path, unsigned int maj, unsigned int min)
+{
+ struct dirent *dir;
+ struct stat st;
+ int found = 0;
+ DIR *D;
+
+ D = opendir(path);
+ if (!D)
+ return 0;
+
+ while ((dir = readdir(D)) != NULL) {
+ char full_path[256];
+
+ if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
+ continue;
+
+ sprintf(full_path, "%s/%s", path, dir->d_name);
+ if (lstat(full_path, &st) == -1) {
+ perror("lstat");
+ break;
+ }
+
+ if (S_ISDIR(st.st_mode)) {
+ found = lookup_device(full_path, maj, min);
+ if (found) {
+ strcpy(path, full_path);
+ break;
+ }
+ }
+
+ if (!S_ISBLK(st.st_mode))
+ continue;
+
+ if (maj == major(st.st_rdev) && min == minor(st.st_rdev)) {
+ strcpy(path, full_path);
+ found = 1;
+ break;
+ }
+ }
+
+ closedir(D);
+ return found;
+}
+
+#define FMINORBITS 20
+#define FMINORMASK ((1U << FMINORBITS) - 1)
+#define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS))
+#define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK))
+
+static void trace_add_file(struct thread_data *td, __u32 device)
+{
+ static unsigned int last_maj, last_min;
+ unsigned int maj = FMAJOR(device);
+ unsigned int min = FMINOR(device);
+ struct fio_file *f;
+ char dev[256];
+ unsigned int i;
+
+ if (last_maj == maj && last_min == min)
+ return;
+
+ last_maj = maj;
+ last_min = min;
+
+ /*
+ * check for this file in our list
+ */
+ for_each_file(td, f, i)
+ if (f->major == maj && f->minor == min)
+ return;
+
+ strcpy(dev, "/dev");
+ if (lookup_device(dev, maj, min))
+ add_file(td, dev);
+}
+
/*
* Store blk_io_trace data in an ipo for later retrieval.
*/
return;
if (t->action & BLK_TC_ACT(BLK_TC_PC))
return;
-
- /*
- * should not happen, need to look into that...
- */
- if (!t->bytes)
+ if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY))
return;
+ trace_add_file(td, t->device);
+
rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0;
if (t->bytes > bs[rw])
{
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;
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));
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;
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);
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;