X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=6418cf1f6c15ff4cbffbac5d6964399f64e33615;hp=e3e084e60185b28b72fe7e66ee26115738d1b612;hb=666bf1234912c3790ff1e6204596891c6ef7180c;hpb=5ec10eaad3b09875b91e19a20bbdfa06f2117562

diff --git a/stat.c b/stat.c
index e3e084e6..6418cf1f 100644
--- a/stat.c
+++ b/stat.c
@@ -8,49 +8,7 @@
 #include <math.h>
 
 #include "fio.h"
-
-/*
- * Cheesy number->string conversion, complete with carry rounding error.
- */
-static char *num2str(unsigned long num, int maxlen, int base, int pow2)
-{
-	char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
-	unsigned int thousand;
-	char *buf;
-	int i;
-
-	if (pow2)
-		thousand = 1024;
-	else
-		thousand = 1000;
-
-	buf = malloc(128);
-
-	for (i = 0; base > 1; i++)
-		base /= thousand;
-
-	do {
-		int len, carry = 0;
-
-		len = sprintf(buf, "%'lu", num);
-		if (len <= maxlen) {
-			if (i >= 1) {
-				buf[len] = postfix[i];
-				buf[len + 1] = '\0';
-			}
-			return buf;
-		}
-
-		if ((num % thousand) >= (thousand / 2))
-			carry = 1;
-
-		num /= thousand;
-		num += carry;
-		i++;
-	} while (i <= 5);
-
-	return buf;
-}
+#include "diskutil.h"
 
 void update_rusage_stat(struct thread_data *td)
 {
@@ -101,15 +59,17 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 	log_info("\nRun status group %d (all jobs):\n", id);
 
 	for (i = 0; i <= DDIR_WRITE; i++) {
+		const int i2p = is_power_of_2(rs->kb_base);
+
 		if (!rs->max_run[i])
 			continue;
 
-		p1 = num2str(rs->io_kb[i], 6, 1000, 1);
-		p2 = num2str(rs->agg[i], 6, 1000, 1);
-		p3 = num2str(rs->min_bw[i], 6, 1000, 1);
-		p4 = num2str(rs->max_bw[i], 6, 1000, 1);
+		p1 = num2str(rs->io_kb[i], 6, rs->kb_base, i2p);
+		p2 = num2str(rs->agg[i], 6, rs->kb_base, i2p);
+		p3 = num2str(rs->min_bw[i], 6, rs->kb_base, i2p);
+		p4 = num2str(rs->max_bw[i], 6, rs->kb_base, i2p);
 
-		log_info("%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s,"
+		log_info("%s: io=%sB, aggrb=%sB/s, minb=%sB/s, maxb=%sB/s,"
 			 " mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2,
 						p3, p4, rs->min_run[i],
 						rs->max_run[i]);
@@ -124,7 +84,8 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 #define ts_total_io_u(ts)	\
 	((ts)->total_io_u[0] + (ts)->total_io_u[1])
 
-static void stat_calc_dist(struct thread_stat *ts, double *io_u_dist)
+static void stat_calc_dist(unsigned int *map, unsigned long total,
+			   double *io_u_dist)
 {
 	int i;
 
@@ -132,27 +93,33 @@ static void stat_calc_dist(struct thread_stat *ts, double *io_u_dist)
 	 * Do depth distribution calculations
 	 */
 	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;
+		if (total) {
+			io_u_dist[i] = (double) map[i] / (double) total;
+			io_u_dist[i] *= 100.0;
+			if (io_u_dist[i] < 0.1 && map[i])
+				io_u_dist[i] = 0.1;
+		} else
+			io_u_dist[i] = 0.0;
 	}
 }
 
 static void stat_calc_lat(struct thread_stat *ts, double *dst,
 			  unsigned int *src, int nr)
 {
+	unsigned long total = ts_total_io_u(ts);
 	int i;
 
 	/*
 	 * Do latency distribution calculations
 	 */
 	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;
+		if (total) {
+			dst[i] = (double) src[i] / (double) total;
+			dst[i] *= 100.0;
+			if (dst[i] < 0.01 && src[i])
+				dst[i] = 0.01;
+		} else
+			dst[i] = 0.0;
 	}
 }
 
@@ -184,21 +151,26 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 			     int ddir)
 {
 	const char *ddir_str[] = { "read ", "write" };
-	unsigned long min, max;
+	unsigned long min, max, runt;
 	unsigned long long bw, iops;
 	double mean, dev;
 	char *io_p, *bw_p, *iops_p;
+	int i2p;
 
 	if (!ts->runtime[ddir])
 		return;
 
-	bw = ts->io_bytes[ddir] / ts->runtime[ddir];
-	iops = (1000 * ts->total_io_u[ddir]) / ts->runtime[ddir];
-	io_p = num2str(ts->io_bytes[ddir] >> 10, 6, 1000, 1);
-	bw_p = num2str(bw, 6, 1000, 1);
+	i2p = is_power_of_2(rs->kb_base);
+	runt = ts->runtime[ddir];
+
+	bw = (1000 * ts->io_bytes[ddir]) / runt;
+	io_p = num2str(ts->io_bytes[ddir], 6, 1, i2p);
+	bw_p = num2str(bw, 6, 1, i2p);
+
+	iops = (1000 * ts->total_io_u[ddir]) / runt;
 	iops_p = num2str(iops, 6, 1, 0);
 
-	log_info("  %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n",
+	log_info("  %s: io=%sB, bw=%sB/s, iops=%s, runt=%6lumsec\n",
 					ddir_str[ddir], io_p, bw_p, iops_p,
 					ts->runtime[ddir]);
 
@@ -242,7 +214,7 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 		double p_of_agg;
 
 		p_of_agg = mean * 100 / (double) rs->agg[ddir];
-		log_info("    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%,"
+		log_info("    bw (KB/s) : min=%5lu, max=%5lu, per=%3.2f%%,"
 			 " avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg,
 							mean, dev);
 	}
@@ -313,11 +285,11 @@ static void show_thread_status(struct thread_stat *ts,
 	if (!ts->error) {
 		log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n",
 					ts->name, ts->groupid, ts->members,
-					ts->error, ts->pid);
+					ts->error, (int) ts->pid);
 	} else {
 		log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d\n",
 					ts->name, ts->groupid, ts->members,
-					ts->error, ts->verror, ts->pid);
+					ts->error, ts->verror, (int) ts->pid);
 	}
 
 	if (ts->description)
@@ -342,20 +314,37 @@ static void show_thread_status(struct thread_stat *ts,
 	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_u(ts, io_u_lat_u);
-	stat_calc_lat_m(ts, io_u_lat_m);
-
+	stat_calc_dist(ts->io_u_map, ts_total_io_u(ts), io_u_dist);
 	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]);
+
+	stat_calc_dist(ts->io_u_submit, ts->total_submit, io_u_dist);
+	log_info("     submit    : 0=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%,"
+		 " 32=%3.1f%%, 64=%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]);
+	stat_calc_dist(ts->io_u_complete, ts->total_complete, io_u_dist);
+	log_info("     complete  : 0=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%,"
+		 " 32=%3.1f%%, 64=%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]);
-
+	stat_calc_lat_u(ts, io_u_lat_u);
+	stat_calc_lat_m(ts, io_u_lat_m);
 	show_latencies(io_u_lat_u, io_u_lat_m);
+	if (ts->continue_on_error) {
+		log_info("     errors    : total=%lu, first_error=%d/<%s>\n",
+					ts->total_err_count,
+					ts->first_error,
+					strerror(ts->first_error));
+	}
 }
 
 static void show_ddir_status_terse(struct thread_stat *ts,
@@ -419,7 +408,7 @@ static void show_thread_status_terse(struct thread_stat *ts,
 	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_dist(ts->io_u_map, ts_total_io_u(ts), io_u_dist);
 	stat_calc_lat_u(ts, io_u_lat_u);
 	stat_calc_lat_m(ts, io_u_lat_m);
 
@@ -431,6 +420,8 @@ static void show_thread_status_terse(struct thread_stat *ts,
 		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]);
+	if (ts->continue_on_error)
+		log_info(";%lu;%d", ts->total_err_count, ts->first_error);
 	log_info("\n");
 
 	if (ts->description)
@@ -470,6 +461,7 @@ void show_run_stats(void)
 	struct thread_data *td;
 	struct thread_stat *threadstats, *ts;
 	int i, j, k, l, nr_ts, last_ts, idx;
+	int kb_base_warned = 0;
 
 	runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
 
@@ -542,11 +534,26 @@ void show_run_stats(void)
 			 * first pid in group, not very useful...
 			 */
 			ts->pid = td->pid;
+
+			ts->kb_base = td->o.kb_base;
+		} else if (ts->kb_base != td->o.kb_base && !kb_base_warned) {
+			log_info("fio: kb_base differs for jobs in group, using"
+				 " %u as the base\n", ts->kb_base);
+			kb_base_warned = 1;
 		}
 
-		if (td->error && !ts->error) {
-			ts->error = td->error;
-			ts->verror = td->verror;
+		ts->continue_on_error = td->o.continue_on_error;
+		ts->total_err_count += td->total_err_count;
+		ts->first_error = td->first_error;
+		if (!ts->error) {
+			if (!td->error && td->o.continue_on_error &&
+			    td->first_error) {
+				ts->error = td->first_error;
+				ts->verror = td->verror;
+			} else  if (td->error) {
+				ts->error = td->error;
+				ts->verror = td->verror;
+			}
 		}
 
 		for (l = 0; l <= DDIR_WRITE; l++) {
@@ -569,6 +576,10 @@ void show_run_stats(void)
 
 		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_MAP_NR; k++)
+			ts->io_u_submit[k] += td->ts.io_u_submit[k];
+		for (k = 0; k < FIO_IO_U_MAP_NR; k++)
+			ts->io_u_complete[k] += td->ts.io_u_complete[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++)
@@ -581,6 +592,8 @@ void show_run_stats(void)
 		}
 
 		ts->total_run_time += td->ts.total_run_time;
+		ts->total_submit += td->ts.total_submit;
+		ts->total_complete += td->ts.total_complete;
 	}
 
 	for (i = 0; i < nr_ts; i++) {
@@ -588,6 +601,7 @@ void show_run_stats(void)
 
 		ts = &threadstats[i];
 		rs = &runstats[ts->groupid];
+		rs->kb_base = ts->kb_base;
 
 		for (j = 0; j <= DDIR_WRITE; j++) {
 			if (!ts->runtime[j])
@@ -598,25 +612,32 @@ void show_run_stats(void)
 				rs->max_run[j] = ts->runtime[j];
 
 			bw = 0;
-			if (ts->runtime[j])
-				bw = ts->io_bytes[j]
-					/ (unsigned long long) ts->runtime[j];
+			if (ts->runtime[j]) {
+				unsigned long runt;
+
+				runt = ts->runtime[j];
+				bw = ts->io_bytes[j] / runt;
+			}
 			if (bw < rs->min_bw[j])
 				rs->min_bw[j] = bw;
 			if (bw > rs->max_bw[j])
 				rs->max_bw[j] = bw;
 
-			rs->io_kb[j] += ts->io_bytes[j] >> 10;
+			rs->io_kb[j] += ts->io_bytes[j] / rs->kb_base;
 		}
 	}
 
 	for (i = 0; i < groupid + 1; i++) {
+		unsigned long max_run[2];
+
 		rs = &runstats[i];
+		max_run[0] = rs->max_run[0];
+		max_run[1] = rs->max_run[1];
 
 		if (rs->max_run[0])
-			rs->agg[0] = (rs->io_kb[0]*1024) / rs->max_run[0];
+			rs->agg[0] = (rs->io_kb[0] * 1000) / max_run[0];
 		if (rs->max_run[1])
-			rs->agg[1] = (rs->io_kb[1]*1024) / rs->max_run[1];
+			rs->agg[1] = (rs->io_kb[1] * 1000) / max_run[1];
 	}
 
 	/*
@@ -666,8 +687,11 @@ static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 }
 
 static void __add_log_sample(struct io_log *iolog, unsigned long val,
-			     enum fio_ddir ddir, unsigned long time)
+			     enum fio_ddir ddir, unsigned int bs,
+			     unsigned long time)
 {
+	const int nr_samples = iolog->nr_samples;
+
 	if (iolog->nr_samples == iolog->max_samples) {
 		int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
 
@@ -675,48 +699,50 @@ static void __add_log_sample(struct io_log *iolog, unsigned long val,
 		iolog->max_samples <<= 1;
 	}
 
-	iolog->log[iolog->nr_samples].val = val;
-	iolog->log[iolog->nr_samples].time = time;
-	iolog->log[iolog->nr_samples].ddir = ddir;
+	iolog->log[nr_samples].val = val;
+	iolog->log[nr_samples].time = time;
+	iolog->log[nr_samples].ddir = ddir;
+	iolog->log[nr_samples].bs = bs;
 	iolog->nr_samples++;
 }
 
 static void add_log_sample(struct thread_data *td, struct io_log *iolog,
-			   unsigned long val, enum fio_ddir ddir)
+			   unsigned long val, enum fio_ddir ddir,
+			   unsigned int bs)
 {
-	__add_log_sample(iolog, val, ddir, mtime_since_now(&td->epoch));
+	__add_log_sample(iolog, val, ddir, bs, mtime_since_now(&td->epoch));
 }
 
-void add_agg_sample(unsigned long val, enum fio_ddir ddir)
+void add_agg_sample(unsigned long val, enum fio_ddir ddir, unsigned int bs)
 {
 	struct io_log *iolog = agg_io_log[ddir];
 
-	__add_log_sample(iolog, val, ddir, mtime_since_genesis());
+	__add_log_sample(iolog, val, ddir, bs, mtime_since_genesis());
 }
 
 void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
-		     unsigned long usec)
+		     unsigned long usec, unsigned int bs)
 {
 	struct thread_stat *ts = &td->ts;
 
 	add_stat_sample(&ts->clat_stat[ddir], usec);
 
 	if (ts->clat_log)
-		add_log_sample(td, ts->clat_log, usec, ddir);
+		add_log_sample(td, ts->clat_log, usec, ddir, bs);
 }
 
 void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
-		     unsigned long usec)
+		     unsigned long usec, unsigned int bs)
 {
 	struct thread_stat *ts = &td->ts;
 
 	add_stat_sample(&ts->slat_stat[ddir], usec);
 
 	if (ts->slat_log)
-		add_log_sample(td, ts->slat_log, usec, ddir);
+		add_log_sample(td, ts->slat_log, usec, ddir, bs);
 }
 
-void add_bw_sample(struct thread_data *td, enum fio_ddir ddir,
+void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
 		   struct timeval *t)
 {
 	struct thread_stat *ts = &td->ts;
@@ -726,11 +752,12 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir,
 	if (spent < td->o.bw_avg_time)
 		return;
 
-	rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) / spent;
+	rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) *
+			1000 / spent / 1024;
 	add_stat_sample(&ts->bw_stat[ddir], rate);
 
 	if (ts->bw_log)
-		add_log_sample(td, ts->bw_log, rate, ddir);
+		add_log_sample(td, ts->bw_log, rate, ddir, bs);
 
 	fio_gettime(&ts->stat_sample_time[ddir], NULL);
 	ts->stat_io_bytes[ddir] = td->this_io_bytes[ddir];