Commit e3979d1a authored by Guillem Jover's avatar Guillem Jover

Update humanize_number() from FreeBSD

Implements HN_IEC_PREFIXES.
parent facbddb6
...@@ -273,6 +273,7 @@ Files: ...@@ -273,6 +273,7 @@ Files:
src/stringlist.c src/stringlist.c
Copyright: Copyright:
Copyright © 1994, 1997-2000, 2002, 2008, 2010 The NetBSD Foundation, Inc. Copyright © 1994, 1997-2000, 2002, 2008, 2010 The NetBSD Foundation, Inc.
Copyright © 2013 John-Mark Gurney <jmg@FreeBSD.org>
All rights reserved. All rights reserved.
. .
Some code was contributed to The NetBSD Foundation by Allen Briggs. Some code was contributed to The NetBSD Foundation by Allen Briggs.
......
...@@ -67,14 +67,16 @@ int pidfile_remove(struct pidfh *pfh); ...@@ -67,14 +67,16 @@ int pidfile_remove(struct pidfh *pfh);
char *fparseln(FILE *, size_t *, size_t *, const char[3], int); char *fparseln(FILE *, size_t *, size_t *, const char[3], int);
__END_DECLS __END_DECLS
/* humanize_number(3) */ /* Values for humanize_number(3)'s flags parameter. */
#define HN_DECIMAL 0x01 #define HN_DECIMAL 0x01
#define HN_NOSPACE 0x02 #define HN_NOSPACE 0x02
#define HN_B 0x04 #define HN_B 0x04
#define HN_DIVISOR_1000 0x08 #define HN_DIVISOR_1000 0x08
#define HN_IEC_PREFIXES 0x10
#define HN_GETSCALE 0x10 /* Values for humanize_number(3)'s scale parameter. */
#define HN_AUTOSCALE 0x20 #define HN_GETSCALE 0x10
#define HN_AUTOSCALE 0x20
/* /*
* fparseln() specific operation flags. * fparseln() specific operation flags.
......
/* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */ /* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */
/* /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
* Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
* All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * This code is derived from software contributed to The NetBSD Foundation
...@@ -31,6 +34,7 @@ ...@@ -31,6 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h>
#include <assert.h> #include <assert.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
...@@ -39,58 +43,81 @@ ...@@ -39,58 +43,81 @@
#include <locale.h> #include <locale.h>
#include <libutil.h> #include <libutil.h>
static const int maxscale = 6;
int int
humanize_number(char *buf, size_t len, int64_t bytes, humanize_number(char *buf, size_t len, int64_t quotient,
const char *suffix, int scale, int flags) const char *suffix, int scale, int flags)
{ {
const char *prefixes, *sep; const char *prefixes, *sep;
int b, i, r, maxscale, s1, s2, sign; int i, r, remainder, s1, s2, sign;
int divisordeccut;
int64_t divisor, max; int64_t divisor, max;
size_t baselen; size_t baselen;
assert(buf != NULL); /* Since so many callers don't check -1, NUL terminate the buffer */
assert(suffix != NULL); if (len > 0)
assert(scale >= 0); buf[0] = '\0';
if (flags & HN_DIVISOR_1000) { /* validate args */
/* SI for decimal multiplies */ if (buf == NULL || suffix == NULL)
divisor = 1000; return (-1);
if (flags & HN_B) if (scale < 0)
prefixes = "B\0k\0M\0G\0T\0P\0E"; return (-1);
else else if (scale > maxscale &&
prefixes = "\0\0k\0M\0G\0T\0P\0E"; ((scale & ~(HN_AUTOSCALE|HN_GETSCALE)) != 0))
} else { return (-1);
if ((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES))
return (-1);
/* setup parameters */
remainder = 0;
if (flags & HN_IEC_PREFIXES) {
baselen = 2;
/* /*
* binary multiplies * Use the prefixes for power of two recommended by
* XXX IEC 60027-2 recommends Ki, Mi, Gi... * the International Electrotechnical Commission
* (IEC) in IEC 80000-3 (i.e. Ki, Mi, Gi...).
*
* HN_IEC_PREFIXES implies a divisor of 1024 here
* (use of HN_DIVISOR_1000 would have triggered
* an assertion earlier).
*/ */
divisor = 1024; divisor = 1024;
divisordeccut = 973; /* ceil(.95 * 1024) */
if (flags & HN_B) if (flags & HN_B)
prefixes = "B\0K\0M\0G\0T\0P\0E"; prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
else else
prefixes = "\0\0K\0M\0G\0T\0P\0E"; prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
} else {
baselen = 1;
if (flags & HN_DIVISOR_1000) {
divisor = 1000;
divisordeccut = 950;
if (flags & HN_B)
prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
else
prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
} else {
divisor = 1024;
divisordeccut = 973; /* ceil(.95 * 1024) */
if (flags & HN_B)
prefixes = "B\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
else
prefixes = "\0\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
}
} }
#define SCALE2PREFIX(scale) (&prefixes[(scale) << 1]) #define SCALE2PREFIX(scale) (&prefixes[(scale) * 3])
maxscale = 7;
if (scale >= maxscale &&
(scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0)
return (-1);
if (buf == NULL || suffix == NULL)
return (-1);
if (len > 0) if (quotient < 0) {
buf[0] = '\0';
if (bytes < 0) {
sign = -1; sign = -1;
bytes *= -100; quotient = -quotient;
baselen = 3; /* sign, digit, prefix */ baselen += 2; /* sign, digit */
} else { } else {
sign = 1; sign = 1;
bytes *= 100; baselen += 1; /* digit */
baselen = 2; /* digit, prefix */
} }
if (flags & HN_NOSPACE) if (flags & HN_NOSPACE)
sep = ""; sep = "";
...@@ -106,7 +133,7 @@ humanize_number(char *buf, size_t len, int64_t bytes, ...@@ -106,7 +133,7 @@ humanize_number(char *buf, size_t len, int64_t bytes,
if (scale & (HN_AUTOSCALE | HN_GETSCALE)) { if (scale & (HN_AUTOSCALE | HN_GETSCALE)) {
/* See if there is additional columns can be used. */ /* See if there is additional columns can be used. */
for (max = 100, i = len - baselen; i-- > 0;) for (max = 1, i = len - baselen; i-- > 0;)
max *= 10; max *= 10;
/* /*
...@@ -114,29 +141,39 @@ humanize_number(char *buf, size_t len, int64_t bytes, ...@@ -114,29 +141,39 @@ humanize_number(char *buf, size_t len, int64_t bytes,
* If there will be an overflow by the rounding below, * If there will be an overflow by the rounding below,
* divide once more. * divide once more.
*/ */
for (i = 0; bytes >= max - 50 && i < maxscale; i++) for (i = 0;
bytes /= divisor; (quotient >= max || (quotient == max - 1 &&
(remainder >= divisordeccut || remainder >=
divisor / 2))) && i < maxscale; i++) {
remainder = quotient % divisor;
quotient /= divisor;
}
if (scale & HN_GETSCALE) if (scale & HN_GETSCALE)
return (i); return (i);
} else } else {
for (i = 0; i < scale && i < maxscale; i++) for (i = 0; i < scale && i < maxscale; i++) {
bytes /= divisor; remainder = quotient % divisor;
quotient /= divisor;
}
}
/* If a value <= 9.9 after rounding and ... */ /* If a value <= 9.9 after rounding and ... */
if (bytes < 995 && i > 0 && flags & HN_DECIMAL) { /*
/* baselen + \0 + .N */ * XXX - should we make sure there is enough space for the decimal
if (len < baselen + 1 + 2) * place and if not, don't do HN_DECIMAL?
return (-1); */
b = ((int)bytes + 5) / 10; if (((quotient == 9 && remainder < divisordeccut) || quotient < 9) &&
s1 = b / 10; i > 0 && flags & HN_DECIMAL) {
s2 = b % 10; s1 = (int)quotient + ((remainder * 10 + divisor / 2) /
divisor / 10);
s2 = ((remainder * 10 + divisor / 2) / divisor) % 10;
r = snprintf(buf, len, "%d%s%d%s%s%s", r = snprintf(buf, len, "%d%s%d%s%s%s",
sign * s1, localeconv()->decimal_point, s2, sign * s1, localeconv()->decimal_point, s2,
sep, SCALE2PREFIX(i), suffix); sep, SCALE2PREFIX(i), suffix);
} else } else
r = snprintf(buf, len, "%" PRId64 "%s%s%s", r = snprintf(buf, len, "%" PRId64 "%s%s%s",
sign * ((bytes + 50) / 100), sign * (quotient + (remainder + divisor / 2) / divisor),
sep, SCALE2PREFIX(i), suffix); sep, SCALE2PREFIX(i), suffix);
return (r); return (r);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment