X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=a9e87aa7cc35d32263d79965fa8ea94365d8e9d2;hp=6e7c23570bf88836e8b1911aa7719c1a1e8581ef;hb=4d9345ae968ca92ace3dab06c25a9b73159cb329;hpb=ddf4a69b083416fa0e626f591b3b425085656531

diff --git a/stat.c b/stat.c
index 6e7c2357..a9e87aa7 100644
--- a/stat.c
+++ b/stat.c
@@ -205,7 +205,7 @@ void init_disk_util(struct thread_data *td)
 	dev_t dev;
 	char *p;
 
-	if (!td->do_disk_util)
+	if (!td->do_disk_util || (td->io_ops->flags & (FIO_NETIO | FIO_NULLIO)))
 		return;
 
 	/*
@@ -275,7 +275,6 @@ void update_rusage_stat(struct thread_data *td)
 	td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
 	td->sys_time += mtime_since(&td->ru_start.ru_stime, &td->ru_end.ru_stime);
 	td->ctx += td->ru_end.ru_nvcsw + td->ru_end.ru_nivcsw - (td->ru_start.ru_nvcsw + td->ru_start.ru_nivcsw);
-
 	
 	memcpy(&td->ru_start, &td->ru_end, sizeof(td->ru_end));
 }
@@ -283,7 +282,7 @@ void update_rusage_stat(struct thread_data *td)
 static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
 		    double *mean, double *dev)
 {
-	double n, o;
+	double n = is->samples;
 
 	if (is->samples == 0)
 		return 0;
@@ -292,17 +291,12 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
 	*max = is->max_val;
 
 	n = (double) is->samples;
-	*mean = (double) is->val / n;
-	*dev = 0.01;
-
-	if (n <= 1.0)
-		return 1;
+	*mean = is->mean;
 
-	o = ((double) is->val_sq - (*mean * is->val)) / n;
-	if (o < 0.0)
-		*dev = -1.0;
+	if (n > 1.0)
+		*dev = sqrt(is->S / (n - 1.0));
 	else
-		*dev = sqrt(o);
+		*dev = -1.0;
 
 	return 1;
 }
@@ -363,16 +357,16 @@ static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
 	fprintf(f_out, "  %s: io=%6lluMiB, bw=%6lluKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
 
 	if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
-		fprintf(f_out, "    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
+		fprintf(f_out, "    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
 
 	if (calc_lat(&td->clat_stat[ddir], &min, &max, &mean, &dev))
-		fprintf(f_out, "    clat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
+		fprintf(f_out, "    clat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
 
 	if (calc_lat(&td->bw_stat[ddir], &min, &max, &mean, &dev)) {
 		double p_of_agg;
 
 		p_of_agg = mean * 100 / (double) rs->agg[ddir];
-		fprintf(f_out, "    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, dev=%5.02f\n", min, max, p_of_agg, mean, dev);
+		fprintf(f_out, "    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg, mean, dev);
 	}
 }
 
@@ -381,11 +375,13 @@ static void show_thread_status(struct thread_data *td,
 {
 	double usr_cpu, sys_cpu;
 	unsigned long runtime;
+	double io_u_dist[FIO_IO_U_MAP_NR];
+	int i;
 
 	if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
 		return;
 
-	fprintf(f_out, "%s: (groupid=%d): err=%2d:\n",td->name, td->groupid, td->error);
+	fprintf(f_out, "%s: (groupid=%d): err=%2d: pid=%d\n",td->name, td->groupid, td->error, td->pid);
 
 	show_ddir_status(td, rs, td->ddir);
 	if (td->io_bytes[td->ddir ^ 1])
@@ -403,6 +399,19 @@ static void show_thread_status(struct thread_data *td,
 	}
 
 	fprintf(f_out, "  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, td->ctx);
+
+	/*
+	 * Do depth distribution calculations
+	 */
+	for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
+		io_u_dist[i] = (double) td->io_u_map[i] / (double) td->total_io_u;
+		io_u_dist[i] *= 100.0;
+	}
+
+	fprintf(f_out, "  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]);
+
+	if (td->description)
+		fprintf(f_out, "%s\n", td->description);
 }
 
 static void show_ddir_status_terse(struct thread_data *td,
@@ -550,20 +559,26 @@ void show_run_stats(void)
 	free(runstats);
 }
 
-static inline void add_stat_sample(struct io_stat *is, unsigned long val)
+static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 {
-	if (val > is->max_val)
-		is->max_val = val;
-	if (val < is->min_val)
-		is->min_val = val;
+	double val = data;
+	double delta, n;
+
+	if (data > is->max_val)
+		is->max_val = data;
+	if (data < is->min_val)
+		is->min_val = data;
+
+	delta = val - is->mean;
+	n = is->samples + 1.0;
+	is->mean += delta / n;
+	is->S += delta * (val - is->mean);
 
-	is->val += val;
-	is->val_sq += val * val;
 	is->samples++;
 }
 
-static void add_log_sample(struct thread_data *td, struct io_log *iolog,
-			   unsigned long val, enum fio_ddir ddir)
+static void __add_log_sample(struct io_log *iolog, unsigned long val,
+			     enum fio_ddir ddir, unsigned long time)
 {
 	if (iolog->nr_samples == iolog->max_samples) {
 		int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
@@ -573,11 +588,24 @@ static void add_log_sample(struct thread_data *td, struct io_log *iolog,
 	}
 
 	iolog->log[iolog->nr_samples].val = val;
-	iolog->log[iolog->nr_samples].time = mtime_since_now(&td->epoch);
+	iolog->log[iolog->nr_samples].time = time;
 	iolog->log[iolog->nr_samples].ddir = ddir;
 	iolog->nr_samples++;
 }
 
+static void add_log_sample(struct thread_data *td, struct io_log *iolog,
+			   unsigned long val, enum fio_ddir ddir)
+{
+	__add_log_sample(iolog, val, ddir, mtime_since_now(&td->epoch));
+}
+
+void add_agg_sample(unsigned long val, enum fio_ddir ddir)
+{
+	struct io_log *iolog = agg_io_log[ddir];
+
+	__add_log_sample(iolog, val, ddir, mtime_since_genesis());
+}
+
 void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
 		     unsigned long msec)
 {