X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fnum2str.c;h=ed3545d95634553640d3ccaf537e0e436d432ac2;hb=5c8e84cab3bca39de54a69092473f000f8a57f40;hp=e114cdf8ebea83db1d79725403475f977b7d7cc9;hpb=1ec3d69b0ed8cc7a3eba0192685034d5442989e4;p=fio.git

diff --git a/lib/num2str.c b/lib/num2str.c
index e114cdf8..ed3545d9 100644
--- a/lib/num2str.c
+++ b/lib/num2str.c
@@ -2,47 +2,102 @@
 #include <stdio.h>
 #include <string.h>
 
-/*
- * Cheesy number->string conversion, complete with carry rounding error.
+#include "../fio.h"
+
+/**
+ * num2str() - Cheesy number->string conversion, complete with carry rounding error.
+ * @num: quantity (e.g., number of blocks, bytes or bits)
+ * @maxlen: max number of digits in the output string (not counting prefix and units)
+ * @base: multiplier for num (e.g., if num represents Ki, use 1024)
+ * @pow2: select unit prefix - 0=power-of-10 decimal SI, nonzero=power-of-2 binary IEC
+ * @units: select units - N2S_* macros defined in fio.h
+ * @returns a malloc'd buffer containing "number[<unit prefix>][<units>]"
  */
-char *num2str(unsigned long num, int maxlen, int base, int pow2)
+char *num2str(uint64_t num, int maxlen, int base, int pow2, int units)
 {
-	char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
-	unsigned int thousand[] = { 1000, 1024 };
+	const char *sistr[] = { "", "k", "M", "G", "T", "P" };
+	const char *iecstr[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
+	const char **unitprefix;
+	const char *unitstr[] = { "", "/s", "B", "bit", "B/s", "bit/s" };
+	const unsigned int thousand[] = { 1000, 1024 };
 	unsigned int modulo, decimals;
-	int post_index;
-	char tmp[32], fmt[8];
+	int unit_index = 0, post_index, carry = 0;
+	char tmp[32];
 	char *buf;
 
+	compiletime_assert(sizeof(sistr) == sizeof(iecstr), "unit prefix arrays must be identical sizes");
+
 	buf = malloc(128);
+	if (!buf)
+		return NULL;
+
+	if (pow2)
+		unitprefix = iecstr;
+	else
+		unitprefix = sistr;
 
 	for (post_index = 0; base > 1; post_index++)
 		base /= thousand[!!pow2];
 
+	switch (units) {
+	case N2S_PERSEC:
+		unit_index = 1;
+		break;
+	case N2S_BYTE:
+		unit_index = 2;
+		break;
+	case N2S_BIT:
+		unit_index = 3;
+		num *= 8;
+		break;
+	case N2S_BYTEPERSEC:
+		unit_index = 4;
+		break;
+	case N2S_BITPERSEC:
+		unit_index = 5;
+		num *= 8;
+		break;
+	}
+
 	modulo = -1U;
-	while (post_index < sizeof(postfix)) {
-		sprintf(tmp, "%lu", num);
+	while (post_index < sizeof(sistr)) {
+		sprintf(tmp, "%llu", (unsigned long long) num);
 		if (strlen(tmp) <= maxlen)
 			break;
 
 		modulo = num % thousand[!!pow2];
 		num /= thousand[!!pow2];
+		carry = modulo >= thousand[!!pow2] / 2;
 		post_index++;
 	}
 
 	if (modulo == -1U) {
 done:
-		sprintf(buf, "%lu%c", num, postfix[post_index]);
+		if (post_index >= ARRAY_SIZE(sistr))
+			post_index = 0;
+
+		sprintf(buf, "%llu%s%s", (unsigned long long) num,
+			unitprefix[post_index], unitstr[unit_index]);
 		return buf;
 	}
 
-	sprintf(tmp, "%lu", num);
+	sprintf(tmp, "%llu", (unsigned long long) num);
 	decimals = maxlen - strlen(tmp);
-	if (decimals <= 1)
+	if (decimals <= 1) {
+		if (carry)
+			num++;
 		goto done;
+	}
+
+	do {
+		sprintf(tmp, "%u", modulo);
+		if (strlen(tmp) <= decimals - 1)
+			break;
+
+		modulo = (modulo + 9) / 10;
+	} while (1);
 
-	sprintf(fmt, "%%.%uu", decimals - 1);
-	sprintf(tmp, fmt, modulo);
-	sprintf(buf, "%lu.%s%c", num, tmp, postfix[post_index]);
+	sprintf(buf, "%llu.%u%s%s", (unsigned long long) num, modulo,
+			unitprefix[post_index], unitstr[unit_index]);
 	return buf;
 }