Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1309719
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 06/11] lib/vsprintf: introduce %pl to print in human-readable form |
| Date | 2016-01-14 23:30 +0100 |
| Message-ID | <qQYz1-5b5-45@gated-at.bofh.it> (permalink) |
| References | <qQYz0-5b5-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Introduce a new extension for printing given unsigned long long value in
human-readable form with automatically choosen IEC binary prefix. The value is
passed by reference.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
Documentation/printk-formats.txt | 11 +++++++++++
lib/test_printf.c | 21 +++++++++++++++++++++
lib/vsprintf.c | 26 +++++++++++++++++++++++++-
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 5d1128b..8e8b4c0 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -287,6 +287,17 @@ struct clk:
Passed by reference.
+unsigned long long value in human-readable form (with IEC binary prefix):
+
+ %pl 1023 KiB (1047552)
+ %pl 1048575 B (1048575)
+ %pl 1 MiB (1048576)
+
+ For printing given unsigned long long value in human-readable form with
+ automatically choosen IEC binary prefix.
+
+ Passed by reference.
+
bitmap and its derivatives such as cpumask and nodemask:
%*pb 0779
diff --git a/lib/test_printf.c b/lib/test_printf.c
index fd985f6..1e078c2 100644
--- a/lib/test_printf.c
+++ b/lib/test_printf.c
@@ -407,6 +407,26 @@ bitmap(void)
}
static void __init
+human_readable(void)
+{
+ struct hr_test_data {
+ unsigned long long v;
+ const char *r;
+ };
+ struct hr_test_data htdpl[] = {
+ { .v = 1097364144128ULL, .r = "1022 GiB" },
+ { .v = 1097364144125ULL, .r = "1097364144125 B" },
+ { .v = 1048576ULL, .r = "1 MiB" },
+ { .v = 1048575ULL, .r = "1048575 B" },
+ { .v = 1047552ULL, .r = "1023 KiB" },
+ };
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(htdpl); i++)
+ test(htdpl[i].r, "%pl", &htdpl[i].v);
+}
+
+static void __init
netdev_features(void)
{
}
@@ -428,6 +448,7 @@ test_pointer(void)
struct_va_format();
struct_clk();
bitmap();
+ human_readable();
netdev_features();
}
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index f0789e3..8288470 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1306,6 +1306,28 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
}
static noinline_for_stack
+char *human_readable(char *buf, char *end, const void *addr,
+ struct printf_spec spec, const char *fmt)
+{
+ unsigned long long value = *(unsigned long long *)addr;
+ unsigned long index;
+
+ if (value)
+ index = __ffs64(value) / 10;
+ else
+ index = 0;
+
+ /* Print numeric part */
+ buf = number(buf, end, value >> (index * 10), default_dec_spec);
+
+ /* Space between numeric part and units */
+ buf = put_one_char(buf, end, ' ');
+
+ /* Print units */
+ return string(buf, end, string_units_2[index], default_str_spec);
+}
+
+static noinline_for_stack
char *netdev_bits(char *buf, char *end, const void *addr, const char *fmt)
{
unsigned long long num;
@@ -1437,6 +1459,7 @@ int kptr_restrict __read_mostly;
* Do not use this feature without some mechanism to verify the
* correctness of the format string and va_list arguments.
* - 'K' For a kernel pointer that should be hidden from unprivileged users
+ * - 'l' For a value in human-readable form (with IEC binary prefix)
* - 'NF' For a netdev_features_t
* - 'h[CDN]' For a variable-length buffer, it prints it as a hex string with
* a certain separator (' ' by default):
@@ -1590,7 +1613,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
break;
}
break;
-
+ case 'l':
+ return human_readable(buf, end, ptr, spec, fmt);
case 'N':
return netdev_bits(buf, end, ptr, fmt);
case 'a':
--
2.6.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/11] lib/vsprintf: refactor and introduce %pl specifier Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 08/11] lib/vsprintf: allow range of prefix for %pl[From[To]] Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
Re: [PATCH v2 08/11] lib/vsprintf: allow range of prefix for %pl[From[To]] Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-18 22:50 +0100
[PATCH v2 02/11] lib/vsprintf: make default_dec_spec global Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
Re: [PATCH v2 02/11] lib/vsprintf: make default_dec_spec global Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-18 21:40 +0100
[PATCH v2 11/11] pcmciamtd: print value in human-readable form via %.0plKM Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 04/11] lib/string_helpers: export string_units_{2,10} for others Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 03/11] lib/vsprintf: make default_str_spec global Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 07/11] x86/efi: print size and base in binary units in efi_print_memmap Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 10/11] cxgb4: print value in human-readable form via %.0plKM Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 05/11] lib/string_helpers: fix indentation in few places Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
[PATCH v2 06/11] lib/vsprintf: introduce %pl to print in human-readable form Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
Re: [PATCH v2 06/11] lib/vsprintf: introduce %pl to print in human-readable form Joe Perches <joe@perches.com> - 2016-01-15 04:10 +0100
Re: [PATCH v2 06/11] lib/vsprintf: introduce %pl to print in human-readable form Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-18 22:00 +0100
Re: [PATCH v2 06/11] lib/vsprintf: introduce %pl to print in human-readable form "H. Peter Anvin" <hpa@zytor.com> - 2016-01-21 22:20 +0100
[PATCH v2 09/11] lib/vsprintf: use precision field with %pl[From[To]] Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
Re: [PATCH v2 09/11] lib/vsprintf: use precision field with %pl[From[To]] Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-18 23:30 +0100
[PATCH v2 01/11] lib/vsprintf: introduce put_one_char() for 3 line idiom Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-14 23:30 +0100
Re: [PATCH v2 01/11] lib/vsprintf: introduce put_one_char() for 3 line idiom Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-18 21:40 +0100
Re: [PATCH v2 00/11] lib/vsprintf: refactor and introduce %pl specifier Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-21 14:00 +0100
csiph-web