From: Nicolas Pitre <nico@fluxnic.net>
Date: Wed, 14 Oct 2009 03:02:04 +0000 (-0400)
Subject: change throughput display units with fast links
X-Git-Tag: v1.6.5.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=583371af1f88e9cd48fedbb6bbb147d8091fd591;p=git.git

change throughput display units with fast links

Switch to MiB/s when the connection is fast enough (i.e. on a LAN).

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/progress.c b/progress.c
index 132ed95a3..3971f49f4 100644
--- a/progress.c
+++ b/progress.c
@@ -131,7 +131,13 @@ static void throughput_string(struct throughput *tp, off_t total,
 	} else {
 		l -= snprintf(tp->display, l, ", %u bytes", (int)total);
 	}
-	if (rate)
+
+	if (rate > 1 << 10) {
+		int x = rate + 5;  /* for rounding */
+		snprintf(tp->display + sizeof(tp->display) - l, l,
+			 " | %u.%2.2u MiB/s",
+			 x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
+	} else if (rate)
 		snprintf(tp->display + sizeof(tp->display) - l, l,
 			 " | %u KiB/s", rate);
 }