/* Print short or long form depending on byte count. */
uword short_form = n_bytes <= 32;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (n_bytes == 0)
return s;
return s;
}
+u8 *
+format_hex_bytes_no_wrap (u8 * s, va_list * va)
+{
+ u8 *bytes = va_arg (*va, u8 *);
+ int n_bytes = va_arg (*va, int);
+ uword i;
+
+ if (n_bytes == 0)
+ return s;
+
+ for (i = 0; i < n_bytes; i++)
+ s = format (s, "%02x", bytes[i]);
+
+ return s;
+}
+
/* Add variable number of spaces. */
u8 *
format_white_space (u8 * s, va_list * va)
{
- uword n = va_arg (*va, uword);
+ u32 n = va_arg (*va, u32);
while (n-- > 0)
vec_add1 (s, ' ');
return s;
}
+u8 *
+format_duration (u8 *s, va_list *args)
+{
+ f64 t = va_arg (*args, f64);
+ s = format (s, "");
+
+ const f64 seconds_per_minute = 60;
+ const f64 seconds_per_hour = 60 * seconds_per_minute;
+ const f64 seconds_per_day = 24 * seconds_per_hour;
+ uword days, hours, minutes, secs, msecs, usecs;
+
+ days = t / seconds_per_day;
+ t -= days * seconds_per_day;
+
+ hours = t / seconds_per_hour;
+ t -= hours * seconds_per_hour;
+
+ minutes = t / seconds_per_minute;
+ t -= minutes * seconds_per_minute;
+
+ secs = t;
+ t -= secs;
+
+ msecs = 1e3 * t;
+
+ usecs = 1e6 * t;
+ usecs = usecs % 1000;
+
+ if (t == 0.)
+ s = format (s, "0");
+ if (days)
+ s = format (s, "%ddays ", days);
+ if (hours)
+ s = format (s, "%dh ", hours);
+ if (minutes)
+ s = format (s, "%dmin ", minutes);
+ if (secs)
+ s = format (s, "%ds ", secs);
+ if (msecs)
+ s = format (s, "%dms ", msecs);
+ if (usecs)
+ s = format (s, "%dus", usecs);
+
+ return (s);
+}
+
u8 *
format_time_interval (u8 * s, va_list * args)
{
return s;
}
+/* Format base 10 e.g. 100, 100K, 100M, 100G */
+__clib_export u8 *
+format_base10 (u8 *s, va_list *va)
+{
+ uword size = va_arg (*va, uword);
+
+ if (size < 1000)
+ s = format (s, "%d", size);
+ else if (size < 1000000)
+ s = format (s, "%.2fK", (f64) size / 1000.);
+ else if (size < 1000000000)
+ s = format (s, "%.2fM", (f64) size / 1000000.);
+ else
+ s = format (s, "%.2fG", (f64) size / 1000000000.);
+
+ return s;
+}
+
/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
-u8 *
+__clib_export u8 *
format_memory_size (u8 * s, va_list * va)
{
uword size = va_arg (*va, uword);
}
/* Parse memory size e.g. 100, 100k, 100m, 100g. */
-uword
+__clib_export uword
unformat_memory_size (unformat_input_t * input, va_list * va)
{
uword amount, shift, c;
return 1;
}
+/* Unparse memory page size e.g. 4K, 2M */
+__clib_export u8 *
+format_log2_page_size (u8 * s, va_list * va)
+{
+ clib_mem_page_sz_t log2_page_sz = va_arg (*va, clib_mem_page_sz_t);
+
+ if (log2_page_sz == CLIB_MEM_PAGE_SZ_UNKNOWN)
+ return format (s, "unknown");
+
+ if (log2_page_sz == CLIB_MEM_PAGE_SZ_DEFAULT)
+ return format (s, "default");
+
+ if (log2_page_sz == CLIB_MEM_PAGE_SZ_DEFAULT_HUGE)
+ return format (s, "default-hugepage");
+
+ if (log2_page_sz >= 30)
+ return format (s, "%uG", 1 << (log2_page_sz - 30));
+
+ if (log2_page_sz >= 20)
+ return format (s, "%uM", 1 << (log2_page_sz - 20));
+
+ if (log2_page_sz >= 10)
+ return format (s, "%uK", 1 << (log2_page_sz - 10));
+
+ return format (s, "%u", 1 << log2_page_sz);
+}
+
+/* Parse memory page size e.g. 4K, 2M */
+__clib_export uword
+unformat_log2_page_size (unformat_input_t * input, va_list * va)
+{
+ uword amount;
+ clib_mem_page_sz_t *result = va_arg (*va, clib_mem_page_sz_t *);
+
+ if (unformat (input, "default-hugepage"))
+ *result = CLIB_MEM_PAGE_SZ_DEFAULT_HUGE;
+ else if (unformat (input, "default"))
+ *result = CLIB_MEM_PAGE_SZ_DEFAULT;
+ else if (unformat (input, "%wdk", &amount))
+ *result = min_log2 (amount) + 10;
+ else if (unformat (input, "%wdK", &amount))
+ *result = min_log2 (amount) + 10;
+ else if (unformat (input, "%wdm", &amount))
+ *result = min_log2 (amount) + 20;
+ else if (unformat (input, "%wdM", &amount))
+ *result = min_log2 (amount) + 20;
+ else if (unformat (input, "%wdg", &amount))
+ *result = min_log2 (amount) + 30;
+ else if (unformat (input, "%wdG", &amount))
+ *result = min_log2 (amount) + 30;
+ else
+ return 0;
+ return 1;
+}
+
/* Format c identifier: e.g. a_name -> "a name".
- Words for both vector names and null terminated c strings. */
-u8 *
+ Works for both vector names and null terminated c strings. */
+__clib_export u8 *
format_c_identifier (u8 * s, va_list * va)
{
u8 *id = va_arg (*va, u8 *);
l = vec_len (id);
if (id)
- for (i = 0; id[i] != 0 && i < l; i++)
+ for (i = 0; i < l && id[i] != 0; i++)
{
u8 c = id[i];
return s;
}
-u8 *
+__clib_export u8 *
format_hexdump (u8 * s, va_list * args)
{
u8 *data = va_arg (*args, u8 *);
const int line_len = 16;
u8 *line_hex = 0;
u8 *line_str = 0;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (!len)
return s;
if (vec_len (line_hex))
s = format (s, "%U%05x: %v[%v]",
- format_white_space, indent, index, line_hex, line_str);
+ format_white_space, index ? indent : 0,
+ index, line_hex, line_str);
vec_free (line_hex);
vec_free (line_str);
return s;
}
+__clib_export u8 *
+format_u64_bitmap (u8 *s, va_list *args)
+{
+ u64 *bitmap = va_arg (*args, u64 *);
+ int n_uword = va_arg (*args, int);
+ u32 indent = format_get_indent (s);
+
+ s = format (s, "%6s", "");
+
+ for (int i = 60; i >= 0; i -= 4)
+ s = format (s, "%5d", i);
+
+ vec_add1 (s, '\n');
+
+ for (int j = n_uword - 1; j >= 0; j--)
+ {
+ s = format (s, "%U0x%04x ", format_white_space, indent, j * 8);
+ for (int i = 63; i >= 0; i--)
+ {
+ vec_add1 (s, (1ULL << i) & bitmap[j] ? '1' : '.');
+ if (i % 4 == 0)
+ vec_add1 (s, ' ');
+ }
+ s = format (s, "0x%016lx", bitmap[j]);
+ if (j)
+ vec_add1 (s, '\n');
+ }
+
+ return s;
+}
+
/*
* fd.io coding-style-patch-verification: ON
*
Code Review / vpp.git / blobdiff