return 0;
}
-static int lookup_device(char *path, unsigned int maj, unsigned int min)
+static int lookup_device(struct thread_data *td, char *path, unsigned int maj,
+ unsigned int min)
{
struct dirent *dir;
struct stat st;
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
- sprintf(full_path, "%s/%s", path, dir->d_name);
+ sprintf(full_path, "%s%s%s", path, FIO_OS_PATH_SEPARATOR, 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);
+ found = lookup_device(td, full_path, maj, min);
if (found) {
strcpy(path, full_path);
break;
if (!S_ISBLK(st.st_mode))
continue;
+ /*
+ * If replay_redirect is set then always return this device
+ * upon lookup which overrides the device lookup based on
+ * major minor in the actual blktrace
+ */
+ if (td->o.replay_redirect) {
+ dprint(FD_BLKTRACE, "device lookup: %d/%d\n overridden"
+ " with: %s", maj, min,
+ td->o.replay_redirect);
+ strcpy(path, td->o.replay_redirect);
+ found = 1;
+ break;
+ }
+
if (maj == major(st.st_rdev) && min == minor(st.st_rdev)) {
dprint(FD_BLKTRACE, "device lookup: %d/%d\n", maj, min);
strcpy(path, full_path);
#define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS))
#define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK))
-static void trace_add_open_event(struct thread_data *td, int fileno)
+static void trace_add_open_close_event(struct thread_data *td, int fileno, enum file_log_act action)
{
struct io_piece *ipo;
ipo = calloc(1, sizeof(*ipo));
+ init_ipo(ipo);
ipo->ddir = DDIR_INVAL;
ipo->fileno = fileno;
- ipo->file_action = FIO_LOG_OPEN_FILE;
+ ipo->file_action = action;
flist_add_tail(&ipo->list, &td->io_log_list);
}
-static void trace_add_file(struct thread_data *td, __u32 device)
+static int trace_add_file(struct thread_data *td, __u32 device)
{
- static unsigned int last_maj, last_min;
+ static unsigned int last_maj, last_min, last_fileno;
unsigned int maj = FMAJOR(device);
unsigned int min = FMINOR(device);
struct fio_file *f;
unsigned int i;
if (last_maj == maj && last_min == min)
- return;
+ return last_fileno;
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;
+ if (f->major == maj && f->minor == min) {
+ last_fileno = f->fileno;
+ return last_fileno;
+ }
strcpy(dev, "/dev");
- if (lookup_device(dev, maj, min)) {
+ if (lookup_device(td, dev, maj, min)) {
int fileno;
dprint(FD_BLKTRACE, "add devices %s\n", dev);
- fileno = add_file(td, dev);
- trace_add_open_event(td, fileno);
+ fileno = add_file_exclusive(td, dev);
+ trace_add_open_close_event(td, fileno, FIO_LOG_OPEN_FILE);
+ last_fileno = fileno;
}
+ return last_fileno;
}
/*
* Store blk_io_trace data in an ipo for later retrieval.
*/
static void store_ipo(struct thread_data *td, unsigned long long offset,
- unsigned int bytes, int rw, unsigned long long ttime)
+ unsigned int bytes, int rw, unsigned long long ttime,
+ int fileno)
{
struct io_piece *ipo = malloc(sizeof(*ipo));
- memset(ipo, 0, sizeof(*ipo));
- INIT_FLIST_HEAD(&ipo->list);
+ init_ipo(ipo);
+
/*
* the 512 is wrong here, it should be the hardware sector size...
*/
ipo->ddir = DDIR_WRITE;
else
ipo->ddir = DDIR_READ;
+ ipo->fileno = fileno;
dprint(FD_BLKTRACE, "store ddir=%d, off=%llu, len=%lu, delay=%lu\n",
ipo->ddir, ipo->offset,
case BLK_TN_TIMESTAMP:
printf("got timestamp notify: %x, %d\n", t->action, t->pid);
break;
+ case BLK_TN_MESSAGE:
+ break;
default:
dprint(FD_BLKTRACE, "unknown trace act %x\n", t->action);
break;
}
}
+static void handle_trace_discard(struct thread_data *td, struct blk_io_trace *t,
+ unsigned long long ttime, unsigned long *ios)
+{
+ struct io_piece *ipo = malloc(sizeof(*ipo));
+ int fileno;
+
+ init_ipo(ipo);
+ fileno = trace_add_file(td, t->device);
+
+ ios[DDIR_WRITE]++;
+ td->o.size += t->bytes;
+
+ memset(ipo, 0, sizeof(*ipo));
+ INIT_FLIST_HEAD(&ipo->list);
+
+ /*
+ * the 512 is wrong here, it should be the hardware sector size...
+ */
+ ipo->offset = t->sector * 512;
+ ipo->len = t->bytes;
+ ipo->delay = ttime / 1000;
+ ipo->ddir = DDIR_TRIM;
+ ipo->fileno = fileno;
+
+ dprint(FD_BLKTRACE, "store discard, off=%llu, len=%lu, delay=%lu\n",
+ ipo->offset, ipo->len,
+ ipo->delay);
+ queue_io_piece(td, ipo);
+}
+
static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
unsigned long long ttime, unsigned long *ios,
unsigned int *bs)
{
int rw;
+ int fileno;
- trace_add_file(td, t->device);
+ fileno = trace_add_file(td, t->device);
rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0;
ios[rw]++;
td->o.size += t->bytes;
- store_ipo(td, t->sector, t->bytes, rw, ttime);
+ store_ipo(td, t->sector, t->bytes, rw, ttime, fileno);
}
/*
if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY))
handle_trace_notify(t);
+ else if (t->action & BLK_TC_ACT(BLK_TC_DISCARD))
+ handle_trace_discard(td, t, ttime, ios);
else
handle_trace_fs(td, t, ttime, ios, bs);
}
unsigned int cpu;
unsigned int rw_bs[2];
struct fifo *fifo;
- int fd;
+ int fd, i;
+ struct fio_file *f;
fd = open(filename, O_RDONLY);
if (fd < 0) {
delay = t.time - ttime;
if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only)
skipped_writes++;
- else
+ else {
+ /*
+ * set delay to zero if no_stall enabled for
+ * fast replay
+ */
+ if (td->o.no_stall)
+ delay = 0;
+
handle_trace(td, &t, delay, ios, rw_bs);
+ }
ttime = t.time;
cpu = t.cpu;
}
} while (1);
+ 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);
projects / fio.git / blobdiff