X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fstd-formats.c;h=1a150ead7bd7d9815f37a91cf4b916cf934f7aca;hb=162ff5e41;hp=832dbb557f70b058645d7095d96ec722ab10d400;hpb=1e33663e25a03cc92458eae55a6e82940916153b;p=vpp.git

diff --git a/src/vppinfra/std-formats.c b/src/vppinfra/std-formats.c
index 832dbb557f7..1a150ead7bd 100644
--- a/src/vppinfra/std-formats.c
+++ b/src/vppinfra/std-formats.c
@@ -108,6 +108,22 @@ format_hex_bytes (u8 * s, va_list * va)
   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)
@@ -188,8 +204,26 @@ 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);
@@ -218,7 +252,7 @@ format_memory_size (u8 * s, va_list * va)
 }
 
 /* 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;
@@ -252,9 +286,64 @@ unformat_memory_size (unformat_input_t * input, va_list * va)
   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 *);
@@ -265,7 +354,7 @@ format_c_identifier (u8 * s, va_list * va)
     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];
 
@@ -277,7 +366,7 @@ format_c_identifier (u8 * s, va_list * va)
   return s;
 }
 
-u8 *
+__clib_export u8 *
 format_hexdump (u8 * s, va_list * args)
 {
   u8 *data = va_arg (*args, u8 *);