From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 26 Jun 2012 22:20:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
X-Git-Tag: fio-2.0.9~13
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=fb9f08c6b9da943efd334187ac74200e551596f2;hp=5499f7ffa2e603edf571f339c513c5aeef57565c

Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
---

diff --git a/stat.c b/stat.c
index 8c846f66..0a047981 100644
--- a/stat.c
+++ b/stat.c
@@ -523,19 +523,25 @@ void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs)
 	double io_u_dist[FIO_IO_U_MAP_NR];
 	double io_u_lat_u[FIO_IO_U_LAT_U_NR];
 	double io_u_lat_m[FIO_IO_U_LAT_M_NR];
+	time_t time_p;
+	char time_buf[64];
 
 	if (!(ts->io_bytes[0] + ts->io_bytes[1]) &&
 	    !(ts->total_io_u[0] + ts->total_io_u[1]))
 		return;
 
+	time(&time_p);
+	ctime_r((const time_t *) &time_p, time_buf);
+
 	if (!ts->error) {
-		log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n",
+		log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d: %s",
 					ts->name, ts->groupid, ts->members,
-					ts->error, (int) ts->pid);
+					ts->error, (int) ts->pid, time_buf);
 	} else {
-		log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d\n",
+		log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d: %s",
 					ts->name, ts->groupid, ts->members,
-					ts->error, ts->verror, (int) ts->pid);
+					ts->error, ts->verror, (int) ts->pid,
+					time_buf);
 	}
 
 	if (strlen(ts->description))