#include "fio.h"
static int last_majdev, last_mindev;
-static struct itimerval itimer;
-static struct list_head disk_list = LIST_HEAD_INIT(disk_list);
+static struct flist_head disk_list = FLIST_HEAD_INIT(disk_list);
static int get_io_ticks(struct disk_util *du, struct disk_util_stat *dus)
{
char line[256];
FILE *f;
char *p;
+ int ret;
+
+ dprint(FD_DISKUTIL, "open stat file: %s\n", du->path);
f = fopen(du->path, "r");
if (!f)
return 1;
}
- if (sscanf(p, "%u %u %llu %u %u %u %llu %u %u %u %u\n", &dus->ios[0], &dus->merges[0], &dus->sectors[0], &dus->ticks[0], &dus->ios[1], &dus->merges[1], &dus->sectors[1], &dus->ticks[1], &in_flight, &dus->io_ticks, &dus->time_in_queue) != 11) {
- fclose(f);
- return 1;
- }
+ dprint(FD_DISKUTIL, "%s: %s", du->path, p);
+ ret = sscanf(p, "%u %u %llu %u %u %u %llu %u %u %u %u\n", &dus->ios[0],
+ &dus->merges[0], &dus->sectors[0],
+ &dus->ticks[0], &dus->ios[1],
+ &dus->merges[1], &dus->sectors[1],
+ &dus->ticks[1], &in_flight,
+ &dus->io_ticks, &dus->time_in_queue);
fclose(f);
- return 0;
+ dprint(FD_DISKUTIL, "%s: stat read ok? %d\n", du->path, ret == 1);
+ return ret != 11;
}
static void update_io_tick_disk(struct disk_util *du)
void update_io_ticks(void)
{
- struct list_head *entry;
+ struct flist_head *entry;
struct disk_util *du;
- list_for_each(entry, &disk_list) {
- du = list_entry(entry, struct disk_util, list);
+ dprint(FD_DISKUTIL, "update io ticks\n");
+
+ flist_for_each(entry, &disk_list) {
+ du = flist_entry(entry, struct disk_util, list);
update_io_tick_disk(du);
}
}
-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 flist_head *entry;
struct disk_util *du;
- list_for_each(entry, &disk_list) {
- du = list_entry(entry, struct disk_util, list);
+ flist_for_each(entry, &disk_list) {
+ du = flist_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)
{
struct disk_util *du, *__du;
- struct list_head *entry;
+ struct flist_head *entry;
+
+ dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
du = malloc(sizeof(*du));
memset(du, 0, sizeof(*du));
- INIT_LIST_HEAD(&du->list);
+ INIT_FLIST_HEAD(&du->list);
sprintf(du->path, "%s/stat", path);
du->name = strdup(basename(path));
+ du->sysfs_root = path;
du->major = majdev;
du->minor = mindev;
- list_for_each(entry, &disk_list) {
- __du = list_entry(entry, struct disk_util, list);
+ flist_for_each(entry, &disk_list) {
+ __du = flist_entry(entry, struct disk_util, list);
+
+ dprint(FD_DISKUTIL, "found %s in list\n", __du->name);
if (!strcmp(du->name, __du->name)) {
free(du->name);
}
}
+ dprint(FD_DISKUTIL, "add %s to list\n", du->name);
+
fio_gettime(&du->time, NULL);
get_io_ticks(du, &du->last_dus);
- list_add_tail(&du->list, &disk_list);
+ flist_add_tail(&du->list, &disk_list);
}
static int check_dev_match(int majdev, int mindev, char *path)
return 1;
}
-static int find_block_dir(int majdev, int mindev, char *path)
+static int find_block_dir(int majdev, int mindev, char *path, int link_ok)
{
struct dirent *dir;
struct stat st;
}
}
- if (lstat(full_path, &st) == -1) {
- perror("stat");
- break;
+ if (link_ok) {
+ if (stat(full_path, &st) == -1) {
+ perror("stat");
+ break;
+ }
+ } else {
+ if (lstat(full_path, &st) == -1) {
+ perror("stat");
+ break;
+ }
}
if (!S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode))
continue;
- found = find_block_dir(majdev, mindev, full_path);
+ found = find_block_dir(majdev, mindev, full_path, 0);
if (found) {
strcpy(path, full_path);
break;
{
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))
+ dprint(FD_DISKUTIL, "%s belongs to maj/min %d/%d\n", f->file_name,
+ 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
last_mindev = mindev;
last_majdev = majdev;
-
+
sprintf(foo, "/sys/block");
- if (!find_block_dir(majdev, mindev, foo))
+ if (!find_block_dir(majdev, mindev, foo, 1))
return;
/*
__init_disk_util(td, f);
}
-void disk_util_timer_arm(void)
-{
- itimer.it_value.tv_sec = 0;
- itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000;
- setitimer(ITIMER_REAL, &itimer, NULL);
-}
-
void show_disk_util(void)
{
struct disk_util_stat *dus;
- struct list_head *entry, *next;
+ struct flist_head *entry, *next;
struct disk_util *du;
double util;
+ if (flist_empty(&disk_list))
+ return;
+
log_info("\nDisk stats (read/write):\n");
- list_for_each(entry, &disk_list) {
- du = list_entry(entry, struct disk_util, list);
+ flist_for_each(entry, &disk_list) {
+ du = flist_entry(entry, struct disk_util, list);
dus = &du->dus;
util = (double) 100 * du->dus.io_ticks / (double) du->msec;
if (util > 100.0)
util = 100.0;
- log_info(" %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, in_queue=%u, util=%3.2f%%\n", du->name, dus->ios[0], dus->ios[1], dus->merges[0], dus->merges[1], dus->ticks[0], dus->ticks[1], dus->time_in_queue, util);
+ log_info(" %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, "
+ "in_queue=%u, util=%3.2f%%\n", du->name,
+ dus->ios[0], dus->ios[1],
+ dus->merges[0], dus->merges[1],
+ dus->ticks[0], dus->ticks[1],
+ dus->time_in_queue, util);
}
/*
* now free the list
*/
- list_for_each_safe(entry, next, &disk_list) {
- list_del(entry);
- du = list_entry(entry, struct disk_util, list);
+ flist_for_each_safe(entry, next, &disk_list) {
+ flist_del(entry);
+ du = flist_entry(entry, struct disk_util, list);
free(du->name);
free(du);
}