X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=0c2e01b4f3baaf3975ab8c4a5953a7bbc66b60aa;hp=4fe0dbd3dd65a9a129c9a6951bfe9e9bdae3754a;hb=e9459e5a14b577ead39d666c051c7ce4db12bc75;hpb=2dc1bbeb58edc85f2829eed6729862c438ea2353

diff --git a/stat.c b/stat.c
index 4fe0dbd3..0c2e01b4 100644
--- a/stat.c
+++ b/stat.c
@@ -9,10 +9,6 @@
 
 #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.
  */
@@ -56,278 +52,6 @@ static char *num2str(unsigned long num, int maxlen, int base, int pow2)
 	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;
@@ -389,37 +113,6 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 	}
 }
 
-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])
 
@@ -433,6 +126,8 @@ static void stat_calc_dist(struct thread_stat *ts, double *io_u_dist)
 	for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
 		io_u_dist[i] = (double) ts->io_u_map[i] / (double) ts_total_io_u(ts);
 		io_u_dist[i] *= 100.0;
+		if (io_u_dist[i] < 0.1 && ts->io_u_map[i])
+			io_u_dist[i] = 0.1;
 	}
 }
 
@@ -446,6 +141,8 @@ static void stat_calc_lat(struct thread_stat *ts, double *io_u_lat)
 	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;
 	}
 }
 
@@ -528,9 +225,10 @@ static void show_thread_status(struct thread_stat *ts,
 	stat_calc_lat(ts, io_u_lat);
 
 	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.1f%%, 4=%3.1f%%, 10=%3.1f%%, 20=%3.1f%%, 50=%3.1f%%, 100=%3.1f%%\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.1f%%, 500=%3.1f%%, 750=%3.1f%%, 1000=%3.1f%%, >=2000=%3.1f%%\n", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
+	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]);
 }
 
 static void show_ddir_status_terse(struct thread_stat *ts,
@@ -595,8 +293,8 @@ static void show_thread_status_terse(struct thread_stat *ts,
 
 	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.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%\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.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
+	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]);
 
 	if (ts->description)
 		log_info(";%s", ts->description);
@@ -734,8 +432,10 @@ void show_run_stats(void)
 		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 <= 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;
 	}
@@ -813,8 +513,10 @@ static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 		is->min_val = data;
 
 	delta = val - is->mean;
-	is->mean += delta / (is->samples + 1.0);
-	is->S += delta * (val - is->mean);
+	if (delta) {
+		is->mean += delta / (is->samples + 1.0);
+		is->S += delta * (val - is->mean);
+	}
 
 	is->samples++;
 }