X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=a9e87aa7cc35d32263d79965fa8ea94365d8e9d2;hp=d8b065ec48550b60a16fd6361d014031082337ca;hb=24868cabfee01b938a708337ac2087470490b665;hpb=5d4580774d8df3393fc4264c71caed16201821de

diff --git a/stat.c b/stat.c
index d8b065ec..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;
 
 	/*
@@ -381,7 +381,7 @@ static void show_thread_status(struct thread_data *td,
 	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])
@@ -409,6 +409,9 @@ static void show_thread_status(struct thread_data *td,
 	}
 
 	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,
@@ -574,8 +577,8 @@ static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 	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;
@@ -585,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)
 {