From: Jens Axboe <axboe@fb.com>
Date: Tue, 11 Nov 2014 15:09:04 +0000 (-0700)
Subject: t/btrace2fio: fix divide-by-zero in rate calculation
X-Git-Tag: fio-2.1.14~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=97b32195d4713a13a17d409949fff5a08c4518dd;p=fio.git

t/btrace2fio: fix divide-by-zero in rate calculation

If usec is less than 1000, it'd crash.

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

diff --git a/t/btrace2fio.c b/t/btrace2fio.c
index bf67ed0a..efe25c4c 100644
--- a/t/btrace2fio.c
+++ b/t/btrace2fio.c
@@ -546,11 +546,15 @@ static unsigned long o_to_kb_rate(struct btrace_out *o, int rw)
 	uint64_t usec = (o->last_ttime[rw] - o->first_ttime[rw]) / 1000ULL;
 	uint64_t val;
 
+	if (!usec)
+		return 0;
+
+	usec /= 1000;
 	if (!usec)
 		return 0;
 
 	val = o->kb[rw] * 1000ULL;
-	return val / (usec / 1000ULL);
+	return val / usec;
 }
 
 static uint64_t o_first_ttime(struct btrace_out *o)