vlib: fix counter_will_expand prediction

[vpp.git] / src / vppinfra / std-formats.c

diff --git a/src/vppinfra/std-formats.c b/src/vppinfra/std-formats.c
index f4892d6..1616001 100644 (file)
--- a/src/vppinfra/std-formats.c
+++ b/src/vppinfra/std-formats.c
@@ -205,7 +205,7 @@ format_time_interval (u8 * s, va_list * args)
 }
 
 /* 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);
@@ -234,7 +234,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;
@@ -269,7 +269,7 @@ unformat_memory_size (unformat_input_t * input, va_list * va)
 }
 
 /* Unparse memory page size e.g. 4K, 2M */
-u8 *
+__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);
@@ -296,49 +296,36 @@ format_log2_page_size (u8 * s, va_list * va)
 }
 
 /* Parse memory page size e.g. 4K, 2M */
-uword
+__clib_export uword
 unformat_log2_page_size (unformat_input_t * input, va_list * va)
 {
-  uword amount, shift, c;
+  uword amount;
   clib_mem_page_sz_t *result = va_arg (*va, clib_mem_page_sz_t *);
 
-  if (unformat (input, "default"))
-    return CLIB_MEM_PAGE_SZ_DEFAULT;
-
   if (unformat (input, "default-hugepage"))
-    return CLIB_MEM_PAGE_SZ_DEFAULT_HUGE;
-
-  if (!unformat (input, "%wd%_", &amount))
-    return CLIB_MEM_PAGE_SZ_UNKNOWN;
-
-  c = unformat_get_input (input);
-  switch (c)
-    {
-    case 'k':
-    case 'K':
-      shift = 10;
-      break;
-    case 'm':
-    case 'M':
-      shift = 20;
-      break;
-    case 'g':
-    case 'G':
-      shift = 30;
-      break;
-    default:
-      shift = 0;
-      unformat_put_input (input);
-      break;
-    }
-
-  *result = min_log2 (amount) + shift;
+    *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".
    Works for both vector names and null terminated c strings. */
-u8 *
+__clib_export u8 *
 format_c_identifier (u8 * s, va_list * va)
 {
   u8 *id = va_arg (*va, u8 *);
@@ -361,7 +348,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 *);