#include "fio.h"
-static struct itimerval itimer;
-static struct list_head disk_list = LIST_HEAD_INIT(disk_list);
-static dev_t last_dev;
-
/*
* Cheesy number->string conversion, complete with carry rounding error.
*/
return buf;
}
-static int get_io_ticks(struct disk_util *du, struct disk_util_stat *dus)
-{
- unsigned in_flight;
- char line[256];
- FILE *f;
- char *p;
-
- f = fopen(du->path, "r");
- if (!f)
- return 1;
-
- p = fgets(line, sizeof(line), f);
- if (!p) {
- fclose(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;
- }
-
- fclose(f);
- return 0;
-}
-
-static void update_io_tick_disk(struct disk_util *du)
-{
- struct disk_util_stat __dus, *dus, *ldus;
- struct timeval t;
-
- if (get_io_ticks(du, &__dus))
- return;
-
- dus = &du->dus;
- ldus = &du->last_dus;
-
- dus->sectors[0] += (__dus.sectors[0] - ldus->sectors[0]);
- dus->sectors[1] += (__dus.sectors[1] - ldus->sectors[1]);
- dus->ios[0] += (__dus.ios[0] - ldus->ios[0]);
- dus->ios[1] += (__dus.ios[1] - ldus->ios[1]);
- dus->merges[0] += (__dus.merges[0] - ldus->merges[0]);
- dus->merges[1] += (__dus.merges[1] - ldus->merges[1]);
- dus->ticks[0] += (__dus.ticks[0] - ldus->ticks[0]);
- dus->ticks[1] += (__dus.ticks[1] - ldus->ticks[1]);
- dus->io_ticks += (__dus.io_ticks - ldus->io_ticks);
- dus->time_in_queue += (__dus.time_in_queue - ldus->time_in_queue);
-
- fio_gettime(&t, NULL);
- du->msec += mtime_since(&du->time, &t);
- memcpy(&du->time, &t, sizeof(t));
- memcpy(ldus, &__dus, sizeof(__dus));
-}
-
-void update_io_ticks(void)
-{
- struct list_head *entry;
- struct disk_util *du;
-
- list_for_each(entry, &disk_list) {
- du = list_entry(entry, struct disk_util, list);
- update_io_tick_disk(du);
- }
-}
-
-static int disk_util_exists(dev_t dev)
-{
- struct list_head *entry;
- struct disk_util *du;
-
- list_for_each(entry, &disk_list) {
- du = list_entry(entry, struct disk_util, list);
-
- if (du->dev == dev)
- return 1;
- }
-
- return 0;
-}
-
-static void disk_util_add(dev_t dev, char *path)
-{
- struct disk_util *du, *__du;
- struct list_head *entry;
-
- du = malloc(sizeof(*du));
- memset(du, 0, sizeof(*du));
- INIT_LIST_HEAD(&du->list);
- sprintf(du->path, "%s/stat", path);
- du->name = strdup(basename(path));
- du->dev = dev;
-
- list_for_each(entry, &disk_list) {
- __du = list_entry(entry, struct disk_util, list);
-
- if (!strcmp(du->name, __du->name)) {
- free(du->name);
- free(du);
- return;
- }
- }
-
- fio_gettime(&du->time, NULL);
- get_io_ticks(du, &du->last_dus);
-
- list_add_tail(&du->list, &disk_list);
-}
-
-static int check_dev_match(dev_t dev, char *path)
-{
- unsigned int major, minor;
- char line[256], *p;
- FILE *f;
-
- f = fopen(path, "r");
- if (!f) {
- perror("open path");
- return 1;
- }
-
- p = fgets(line, sizeof(line), f);
- if (!p) {
- fclose(f);
- return 1;
- }
-
- if (sscanf(p, "%u:%u", &major, &minor) != 2) {
- fclose(f);
- return 1;
- }
-
- if (((major << 8) | minor) == dev) {
- fclose(f);
- return 0;
- }
-
- fclose(f);
- return 1;
-}
-
-static int find_block_dir(dev_t dev, char *path)
-{
- 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 (!strcmp(dir->d_name, "dev")) {
- if (!check_dev_match(dev, full_path)) {
- found = 1;
- break;
- }
- }
-
- 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(dev, full_path);
- if (found) {
- strcpy(path, full_path);
- break;
- }
- }
-
- closedir(D);
- return found;
-}
-
-static void __init_disk_util(struct thread_data *td, struct fio_file *f)
-{
- struct stat st;
- char foo[PATH_MAX], tmp[PATH_MAX];
- dev_t dev;
- char *p;
-
- if (!stat(f->file_name, &st)) {
- if (S_ISBLK(st.st_mode))
- dev = st.st_rdev;
- else
- dev = st.st_dev;
- } else {
- /*
- * must be a file, open "." in that path
- */
- strncpy(foo, f->file_name, PATH_MAX - 1);
- p = dirname(foo);
- if (stat(p, &st)) {
- perror("disk util stat");
- return;
- }
-
- dev = st.st_dev;
- }
-
- if (disk_util_exists(dev))
- return;
-
- /*
- * for an fs without a device, we will repeatedly stat through
- * sysfs which can take oodles of time for thousands of files. so
- * cache the last lookup and compare with that before going through
- * everything again.
- */
- if (dev == last_dev)
- return;
-
- last_dev = dev;
-
- sprintf(foo, "/sys/block");
- if (!find_block_dir(dev, foo))
- return;
-
- /*
- * If there's a ../queue/ directory there, we are inside a partition.
- * Check if that is the case and jump back. For loop/md/dm etc we
- * are already in the right spot.
- */
- sprintf(tmp, "%s/../queue", foo);
- if (!stat(tmp, &st)) {
- p = dirname(foo);
- sprintf(tmp, "%s/queue", p);
- if (stat(tmp, &st)) {
- log_err("unknown sysfs layout\n");
- return;
- }
- strncpy(tmp, p, PATH_MAX - 1);
- sprintf(foo, "%s", tmp);
- }
-
- if (td->o.ioscheduler && !td->sysfs_root)
- td->sysfs_root = strdup(foo);
-
- disk_util_add(dev, foo);
-}
-
-void init_disk_util(struct thread_data *td)
-{
- struct fio_file *f;
- unsigned int i;
-
- if (!td->o.do_disk_util ||
- (td->io_ops->flags & (FIO_DISKLESSIO | FIO_NODISKUTIL)))
- return;
-
- for_each_file(td, f, i)
- __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 update_rusage_stat(struct thread_data *td)
{
struct thread_stat *ts = &td->ts;
ts->usr_time += mtime_since(&ts->ru_start.ru_utime, &ts->ru_end.ru_utime);
ts->sys_time += mtime_since(&ts->ru_start.ru_stime, &ts->ru_end.ru_stime);
ts->ctx += ts->ru_end.ru_nvcsw + ts->ru_end.ru_nivcsw - (ts->ru_start.ru_nvcsw + ts->ru_start.ru_nivcsw);
+ ts->minf += ts->ru_end.ru_minflt - ts->ru_start.ru_minflt;
+ ts->majf += ts->ru_end.ru_majflt - ts->ru_start.ru_majflt;
memcpy(&ts->ru_start, &ts->ru_end, sizeof(ts->ru_end));
}
if (n > 1.0)
*dev = sqrt(is->S / (n - 1.0));
else
- *dev = -1.0;
+ *dev = 0;
return 1;
}
}
}
-static void show_disk_util(void)
-{
- struct disk_util_stat *dus;
- struct list_head *entry, *next;
- struct disk_util *du;
- double util;
-
- log_info("\nDisk stats (read/write):\n");
-
- list_for_each(entry, &disk_list) {
- du = list_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);
- }
-
- /*
- * now free the list
- */
- list_for_each_safe(entry, next, &disk_list) {
- list_del(entry);
- du = list_entry(entry, struct disk_util, list);
- free(du->name);
- free(du);
- }
-}
-
#define ts_total_io_u(ts) \
((ts)->total_io_u[0] + (ts)->total_io_u[1])
}
}
-static void stat_calc_lat(struct thread_stat *ts, double *io_u_lat)
+static void stat_calc_lat(struct thread_stat *ts, double *dst,
+ unsigned int *src, int nr)
{
int i;
/*
* Do latency distribution calculations
*/
- for (i = 0; i < FIO_IO_U_LAT_NR; i++) {
- io_u_lat[i] = (double) ts->io_u_lat[i] / (double) ts_total_io_u(ts);
- io_u_lat[i] *= 100.0;
- if (io_u_lat[i] < 0.01 && ts->io_u_lat[i])
- io_u_lat[i] = 0.01;
+ for (i = 0; i < nr; i++) {
+ dst[i] = (double) src[i] / (double) ts_total_io_u(ts);
+ dst[i] *= 100.0;
+ if (dst[i] < 0.01 && src[i])
+ dst[i] = 0.01;
+ }
+}
+
+static void stat_calc_lat_u(struct thread_stat *ts, double *io_u_lat)
+{
+ stat_calc_lat(ts, io_u_lat, ts->io_u_lat_u, FIO_IO_U_LAT_U_NR);
+}
+
+static void stat_calc_lat_m(struct thread_stat *ts, double *io_u_lat)
+{
+ stat_calc_lat(ts, io_u_lat, ts->io_u_lat_m, FIO_IO_U_LAT_M_NR);
+}
+
+static int usec_to_msec(unsigned long *min, unsigned long *max, double *mean,
+ double *dev)
+{
+ if (*min > 1000 && *max > 1000 && *mean > 1000.0 && *dev > 1000.0) {
+ *min /= 1000;
+ *max /= 1000;
+ *mean /= 1000.0;
+ *dev /= 1000.0;
+ return 0;
}
+
+ return 1;
}
static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
free(bw_p);
free(iops_p);
- if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
- log_info(" slat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
+ if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) {
+ const char *base = "(usec)";
+ char *minp, *maxp;
- if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev))
- log_info(" clat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
+ if (!usec_to_msec(&min, &max, &mean, &dev))
+ base = "(msec)";
+
+ minp = num2str(min, 6, 1, 0);
+ maxp = num2str(max, 6, 1, 0);
+
+ log_info(" slat %s: min=%s, max=%s, avg=%5.02f, stdev=%5.02f\n", base, minp, maxp, mean, dev);
+
+ free(minp);
+ free(maxp);
+ }
+ if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev)) {
+ const char *base = "(usec)";
+ char *minp, *maxp;
+
+ if (!usec_to_msec(&min, &max, &mean, &dev))
+ base = "(msec)";
+ minp = num2str(min, 6, 1, 0);
+ maxp = num2str(max, 6, 1, 0);
+
+ log_info(" clat %s: min=%s, max=%s, avg=%5.02f, stdev=%5.02f\n", base, minp, maxp, mean, dev);
+
+ free(minp);
+ free(maxp);
+ }
if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
double p_of_agg;
}
}
+static void show_lat(double *io_u_lat, int nr, const char **ranges,
+ const char *msg)
+{
+ int new_line = 1, i, line = 0;
+
+ for (i = 0; i < nr; i++) {
+ if (io_u_lat[i] <= 0.0)
+ continue;
+ if (new_line) {
+ if (line)
+ log_info("\n");
+ log_info(" lat (%s): ", msg);
+ new_line = 0;
+ line = 0;
+ }
+ if (line)
+ log_info(", ");
+ log_info("%s%3.2f%%", ranges[i], io_u_lat[i]);
+ line++;
+ if (line == 5)
+ new_line = 1;
+ }
+}
+
+static void show_lat_u(double *io_u_lat_u)
+{
+ const char *ranges[] = { "2=", "4=", "10=", "20=", "50=", "100=",
+ "250=", "500=", "750=", "1000=", };
+
+ show_lat(io_u_lat_u, FIO_IO_U_LAT_U_NR, ranges, "usec");
+}
+
+static void show_lat_m(double *io_u_lat_m)
+{
+ const char *ranges[] = { "2=", "4=", "10=", "20=", "50=", "100=",
+ "250=", "500=", "750=", "1000=", "2000=",
+ ">=2000=", };
+
+ show_lat(io_u_lat_m, FIO_IO_U_LAT_M_NR, ranges, "msec");
+}
+
+static void show_latencies(double *io_u_lat_u, double *io_u_lat_m)
+{
+ show_lat_u(io_u_lat_u);
+ log_info("\n");
+ show_lat_m(io_u_lat_m);
+ log_info("\n");
+}
+
static void show_thread_status(struct thread_stat *ts,
struct group_run_stats *rs)
{
double usr_cpu, sys_cpu;
unsigned long runtime;
double io_u_dist[FIO_IO_U_MAP_NR];
- double io_u_lat[FIO_IO_U_LAT_NR];
+ double io_u_lat_u[FIO_IO_U_LAT_U_NR];
+ double io_u_lat_m[FIO_IO_U_LAT_M_NR];
- if (!(ts->io_bytes[0] + ts->io_bytes[1]))
+ if (!(ts->io_bytes[0] + ts->io_bytes[1]) &&
+ !(ts->total_io_u[0] + ts->total_io_u[1]))
return;
if (!ts->error)
sys_cpu = 0;
}
- log_info(" cpu : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, ts->ctx);
+ log_info(" cpu : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu, majf=%lu, minf=%lu\n", usr_cpu, sys_cpu, ts->ctx, ts->majf, ts->minf);
stat_calc_dist(ts, io_u_dist);
- stat_calc_lat(ts, io_u_lat);
+ stat_calc_lat_u(ts, io_u_lat_u);
+ stat_calc_lat_m(ts, io_u_lat_m);
log_info(" IO depths : 1=%3.1f%%, 2=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%, 32=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
+ log_info(" issued r/w: total=%lu/%lu, short=%lu/%lu\n", ts->total_io_u[0], ts->total_io_u[1], ts->short_io_u[0], ts->short_io_u[1]);
- log_info(" lat (msec): 2=%3.2f%%, 4=%3.2f%%, 10=%3.2f%%, 20=%3.2f%%, 50=%3.2f%%, 100=%3.2f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
- log_info(" lat (msec): 250=%3.2f%%, 500=%3.2f%%, 750=%3.2f%%, 1000=%3.2f%%, >=2000=%3.2f%%\n", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
+ show_latencies(io_u_lat_u, io_u_lat_m);
}
static void show_ddir_status_terse(struct thread_stat *ts,
struct group_run_stats *rs)
{
double io_u_dist[FIO_IO_U_MAP_NR];
- double io_u_lat[FIO_IO_U_LAT_NR];
+ double io_u_lat_u[FIO_IO_U_LAT_U_NR];
+ double io_u_lat_m[FIO_IO_U_LAT_M_NR];
double usr_cpu, sys_cpu;
+ int i;
log_info("%s;%d;%d", ts->name, ts->groupid, ts->error);
sys_cpu = 0;
}
- log_info(";%f%%;%f%%;%lu", usr_cpu, sys_cpu, ts->ctx);
+ log_info(";%f%%;%f%%;%lu;%lu;%lu", usr_cpu, sys_cpu, ts->ctx, ts->majf, ts->minf);
stat_calc_dist(ts, io_u_dist);
- stat_calc_lat(ts, io_u_lat);
+ stat_calc_lat_u(ts, io_u_lat_u);
+ stat_calc_lat_m(ts, io_u_lat_m);
log_info(";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
- log_info(";%3.2f%%;%3.2f%%;%3.2f%%;%3.2f%%;%3.2f%%;%3.2f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
- log_info(";%3.2f%%;%3.2f%%;%3.2f%%;%3.2f%%;%3.2f%%", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
+ for (i = 0; i < FIO_IO_U_LAT_U_NR; i++)
+ log_info(";%3.2f%%", io_u_lat_u[i]);
+ for (i = 0; i < FIO_IO_U_LAT_M_NR; i++)
+ log_info(";%3.2f%%", io_u_lat_m[i]);
+ log_info("\n");
if (ts->description)
log_info(";%s", ts->description);
ts->usr_time += td->ts.usr_time;
ts->sys_time += td->ts.sys_time;
ts->ctx += td->ts.ctx;
+ ts->majf += td->ts.majf;
+ ts->minf += td->ts.minf;
for (k = 0; k < FIO_IO_U_MAP_NR; k++)
ts->io_u_map[k] += td->ts.io_u_map[k];
- for (k = 0; k < FIO_IO_U_LAT_NR; k++)
- ts->io_u_lat[k] += td->ts.io_u_lat[k];
+ for (k = 0; k < FIO_IO_U_LAT_U_NR; k++)
+ ts->io_u_lat_u[k] += td->ts.io_u_lat_u[k];
+ for (k = 0; k < FIO_IO_U_LAT_M_NR; k++)
+ ts->io_u_lat_m[k] += td->ts.io_u_lat_m[k];
- for (k = 0; k <= DDIR_WRITE; k++)
+
+ for (k = 0; k <= DDIR_WRITE; k++) {
ts->total_io_u[k] += td->ts.total_io_u[k];
+ ts->short_io_u[k] += td->ts.short_io_u[k];
+ }
ts->total_run_time += td->ts.total_run_time;
}
}
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
- unsigned long msec)
+ unsigned long usec)
{
struct thread_stat *ts = &td->ts;
- add_stat_sample(&ts->clat_stat[ddir], msec);
+ add_stat_sample(&ts->clat_stat[ddir], usec);
if (ts->clat_log)
- add_log_sample(td, ts->clat_log, msec, ddir);
+ add_log_sample(td, ts->clat_log, usec, ddir);
}
void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
- unsigned long msec)
+ unsigned long usec)
{
struct thread_stat *ts = &td->ts;
- add_stat_sample(&ts->slat_stat[ddir], msec);
+ add_stat_sample(&ts->slat_stat[ddir], usec);
if (ts->slat_log)
- add_log_sample(td, ts->slat_log, msec, ddir);
+ add_log_sample(td, ts->slat_log, usec, ddir);
}
void add_bw_sample(struct thread_data *td, enum fio_ddir ddir,
projects / fio.git / blobdiff