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);
struct io_piece *ipo;
ipo = calloc(1, sizeof(*ipo));
+ init_ipo(ipo);
ipo->ddir = DDIR_INVAL;
ipo->fileno = fileno;
return;
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);
{
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...
*/
{
struct io_piece *ipo = malloc(sizeof(*ipo));
+ init_ipo(ipo);
trace_add_file(td, t->device);
ios[DDIR_WRITE]++;