}
}
-static int disk_util_exists(int major, int minor)
+static struct disk_util *disk_util_exists(int major, int minor)
{
struct list_head *entry;
struct disk_util *du;
du = list_entry(entry, struct disk_util, list);
if (major == du->major && minor == du->minor)
- return 1;
+ return du;
}
- return 0;
+ return NULL;
}
static void disk_util_add(int majdev, int mindev, char *path)
INIT_LIST_HEAD(&du->list);
sprintf(du->path, "%s/stat", path);
du->name = strdup(basename(path));
+ du->sysfs_root = path;
du->major = majdev;
du->minor = mindev;
{
struct stat st;
char foo[PATH_MAX], tmp[PATH_MAX];
+ struct disk_util *du;
int mindev, majdev;
char *p;
- if (!stat(f->file_name, &st)) {
+ if (!lstat(f->file_name, &st)) {
if (S_ISBLK(st.st_mode)) {
majdev = major(st.st_rdev);
mindev = minor(st.st_rdev);
} else if (S_ISCHR(st.st_mode)) {
majdev = major(st.st_rdev);
mindev = minor(st.st_rdev);
- fio_lookup_raw(st.st_rdev, &majdev, &mindev);
- } else {
+ if (fio_lookup_raw(st.st_rdev, &majdev, &mindev))
+ return;
+ } else if (S_ISFIFO(st.st_mode))
+ return;
+ else {
majdev = major(st.st_dev);
mindev = minor(st.st_dev);
}
mindev = minor(st.st_dev);
}
- if (disk_util_exists(majdev, mindev))
+ du = disk_util_exists(majdev, mindev);
+ if (du) {
+ if (td->o.ioscheduler && !td->sysfs_root)
+ td->sysfs_root = strdup(du->sysfs_root);
+
return;
+ }
/*
* for an fs without a device, we will repeatedly stat through
struct disk_util *du;
double util;
+ if (list_empty(&disk_list))
+ return;
+
log_info("\nDisk stats (read/write):\n");
list_for_each(entry, &disk_list) {