From: Jens Axboe <axboe@fb.com>
Date: Sun, 7 Aug 2016 21:18:38 +0000 (-0600)
Subject: stat: fixups to histogram logging
X-Git-Tag: fio-2.14~54
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=93168285bc564941d832deea172dc1f68de68666

stat: fixups to histogram logging

1) Use correct size for the 'dst' passin to __add_log_sample()
2) Various style fixups

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/stat.c b/stat.c
index 96af94ba..ef9fe7d4 100644
--- a/stat.c
+++ b/stat.c
@@ -2211,28 +2211,36 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
 		add_clat_percentile_sample(ts, usec, ddir);
 
 	if (iolog && iolog->hist_msec) {
-		struct io_hist *hw = &(iolog->hist_window[ddir]);
-		(hw->samples)++;
+		struct io_hist *hw = &iolog->hist_window[ddir];
+
+		hw->samples++;
 		elapsed = mtime_since_now(&td->epoch);
-		if (! hw->hist_last)
+		if (!hw->hist_last)
 			hw->hist_last = elapsed;
 		this_window = elapsed - hw->hist_last;
 		
 		if (this_window >= iolog->hist_msec) {
+			unsigned int *io_u_plat;
+			unsigned int *dst;
+
 			/*
-			 * Make a byte-for-byte copy of the latency histogram stored in
-			 * td->ts.io_u_plat[ddir], recording it in a log sample. Note that
-			 * the matching call to free() is located in iolog.c after printing
-			 * this sample to the log file.
+			 * Make a byte-for-byte copy of the latency histogram
+			 * stored in td->ts.io_u_plat[ddir], recording it in a
+			 * log sample. Note that the matching call to free() is
+			 * located in iolog.c after printing this sample to the
+			 * log file.
 			 */
-			unsigned int *io_u_plat = (unsigned int *)(td->ts.io_u_plat[ddir]);
-			unsigned int *dst = malloc(FIO_IO_U_PLAT_NR * sizeof(unsigned int));
-			memcpy(dst, io_u_plat, FIO_IO_U_PLAT_NR * sizeof(unsigned int));
-			__add_log_sample(iolog, (uint64_t)dst, ddir, bs, elapsed, offset);
+			io_u_plat = (unsigned int *) td->ts.io_u_plat[ddir];
+			dst = malloc(FIO_IO_U_PLAT_NR * sizeof(unsigned int));
+			memcpy(dst, io_u_plat,
+				FIO_IO_U_PLAT_NR * sizeof(unsigned int));
+			__add_log_sample(iolog, (unsigned long )dst, ddir, bs,
+						elapsed, offset);
 
 			/*
-			 * Update the last time we recorded as being now, minus any drift
-			 * in time we encountered before actually making the record.
+			 * Update the last time we recorded as being now, minus
+			 * any drift in time we encountered before actually
+			 * making the record.
 			 */
 			hw->hist_last = elapsed - (this_window - iolog->hist_msec);
 			hw->samples = 0;