X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=a42ed98843bbf6b4d892d0fc6bd1b1af9f2c2e6c;hp=38f94be0138e7a063bb9e31155bc8e78e8f83d28;hb=8de43fd22302237a2b35515ff869fde514dfc76d;hpb=4b43f54ed7dece502350658bee10eba551aeb4a4

diff --git a/stat.c b/stat.c
index 38f94be0..a42ed988 100644
--- a/stat.c
+++ b/stat.c
@@ -58,10 +58,15 @@ void update_rusage_stat(struct thread_data *td)
 
 	getrusage(RUSAGE_SELF, &ts->ru_end);
 
-	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->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));
 }
 
@@ -99,12 +104,15 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 		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, 1024, 1);
+		p2 = num2str(rs->agg[i], 6, 1024, 1);
+		p3 = num2str(rs->min_bw[i], 6, 1024, 1);
+		p4 = num2str(rs->max_bw[i], 6, 1024, 1);
 
-		log_info("%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[i], rs->max_run[i]);
+		log_info("%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s,"
+			 " mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2,
+						p3, p4, rs->min_run[i],
+						rs->max_run[i]);
 
 		free(p1);
 		free(p2);
@@ -116,7 +124,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;
 
@@ -124,26 +133,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;
 	}
 }
 
@@ -175,7 +191,7 @@ 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;
@@ -183,13 +199,18 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 	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);
+	runt = ts->runtime[ddir];
+
+	bw = (1000 * ts->io_bytes[ddir]) / runt;
+	io_p = num2str(ts->io_bytes[ddir] >> 10, 6, 1024, 1);
+	bw_p = num2str(bw >> 10, 6, 1024, 1);
+
+	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", ddir_str[ddir], io_p, bw_p, iops_p, ts->runtime[ddir]);
+	log_info("  %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n",
+					ddir_str[ddir], io_p, bw_p, iops_p,
+					ts->runtime[ddir]);
 
 	free(io_p);
 	free(bw_p);
@@ -197,25 +218,43 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 
 	if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) {
 		const char *base = "(usec)";
+		char *minp, *maxp;
 
 		if (!usec_to_msec(&min, &max, &mean, &dev))
 			base = "(msec)";
 
-		log_info("    slat %s: min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", base, min, max, mean, dev);
+		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)";
 
-		log_info("    clat %s: min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", base, min, max, mean, dev);
+		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;
 
 		p_of_agg = mean * 100 / (double) rs->agg[ddir];
-		log_info("    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg, mean, dev);
+		log_info("    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%,"
+			 " avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg,
+							mean, dev);
 	}
 }
 
@@ -228,6 +267,8 @@ static void show_lat(double *io_u_lat, int nr, const char **ranges,
 		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;
@@ -239,7 +280,6 @@ static void show_lat(double *io_u_lat, int nr, const char **ranges,
 		if (line == 5)
 			new_line = 1;
 	}
-
 }
 
 static void show_lat_u(double *io_u_lat_u)
@@ -262,6 +302,7 @@ static void show_lat_m(double *io_u_lat_m)
 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");
 }
@@ -275,13 +316,19 @@ static void show_thread_status(struct thread_stat *ts,
 	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)
-		log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, 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);
+	if (!ts->error) {
+		log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n",
+					ts->name, ts->groupid, ts->members,
+					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, (int) ts->pid);
+	}
 
 	if (ts->description)
 		log_info("  Description  : [%s]\n", ts->description);
@@ -302,15 +349,33 @@ static void show_thread_status(struct thread_stat *ts,
 		sys_cpu = 0;
 	}
 
-	log_info("  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, ts->ctx);
-
-	stat_calc_dist(ts, io_u_dist);
+	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_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);
-
-	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]);
-
 	show_latencies(io_u_lat_u, io_u_lat_m);
 }
 
@@ -325,7 +390,8 @@ static void show_ddir_status_terse(struct thread_stat *ts,
 	if (ts->runtime[ddir])
 		bw = ts->io_bytes[ddir] / ts->runtime[ddir];
 
-	log_info(";%llu;%llu;%lu", ts->io_bytes[ddir] >> 10, bw, ts->runtime[ddir]);
+	log_info(";%llu;%llu;%lu", ts->io_bytes[ddir] >> 10, bw,
+							ts->runtime[ddir]);
 
 	if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
 		log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
@@ -371,13 +437,16 @@ static void show_thread_status_terse(struct thread_stat *ts,
 		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_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);
 
-	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%%;%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]);
 
 	for (i = 0; i < FIO_IO_U_LAT_U_NR; i++)
 		log_info(";%3.2f%%", io_u_lat_u[i]);
@@ -407,7 +476,8 @@ static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
 		mean = src->mean;
 		S = src->S;
 	} else {
-		mean = ((src->mean * (double) (nr - 1)) + dst->mean) / ((double) nr);
+		mean = ((src->mean * (double) (nr - 1))
+				+ dst->mean) / ((double) nr);
 		S = ((src->S * (double) (nr - 1)) + dst->S) / ((double) nr);
 	}
 
@@ -515,9 +585,15 @@ void show_run_stats(void)
 		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_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++)
@@ -530,6 +606,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++) {
@@ -547,8 +625,12 @@ 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] * 1024 / 1000;
+				bw = ts->io_bytes[j] / runt;
+			}
 			if (bw < rs->min_bw[j])
 				rs->min_bw[j] = bw;
 			if (bw > rs->max_bw[j])
@@ -559,12 +641,16 @@ void show_run_stats(void)
 	}
 
 	for (i = 0; i < groupid + 1; i++) {
+		unsigned long max_run[2];
+
 		rs = &runstats[i];
+		max_run[0] = rs->max_run[0] * 1024 / 1000;
+		max_run[1] = rs->max_run[1] * 1024 / 1000;
 
 		if (rs->max_run[0])
-			rs->agg[0] = (rs->io_kb[0]*1024) / rs->max_run[0];
+			rs->agg[0] = (rs->io_kb[0]*1024) / 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]*1024) / max_run[1];
 	}
 
 	/*
@@ -614,8 +700,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;
 
@@ -623,48 +712,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;
@@ -674,11 +765,11 @@ 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];