X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fmem.c;h=99e4c1d74a0cbf8a5eb5a6b50519cc5862732a3b;hb=1ca6c65e5109b220d25dace08ae758c31e5ea5a2;hp=b417b8503adc9350366775dc0bd05b67b6a5f51d;hpb=6bfd07670b991c30761ef74fb09f42181dbfd182;p=vpp.git

diff --git a/src/vppinfra/mem.c b/src/vppinfra/mem.c
index b417b8503ad..99e4c1d74a0 100644
--- a/src/vppinfra/mem.c
+++ b/src/vppinfra/mem.c
@@ -19,9 +19,9 @@
 #include <vppinfra/format.h>
 #include <vppinfra/clib_error.h>
 
-clib_mem_main_t clib_mem_main;
+__clib_export clib_mem_main_t clib_mem_main;
 
-void *
+__clib_export void *
 clib_mem_vm_map (void *base, uword size, clib_mem_page_sz_t log2_page_sz,
 		 char *fmt, ...)
 {
@@ -38,7 +38,7 @@ clib_mem_vm_map (void *base, uword size, clib_mem_page_sz_t log2_page_sz,
   return rv;
 }
 
-void *
+__clib_export void *
 clib_mem_vm_map_stack (uword size, clib_mem_page_sz_t log2_page_sz,
 		       char *fmt, ...)
 {
@@ -55,7 +55,7 @@ clib_mem_vm_map_stack (uword size, clib_mem_page_sz_t log2_page_sz,
   return rv;
 }
 
-void *
+__clib_export void *
 clib_mem_vm_map_shared (void *base, uword size, int fd, uword offset,
 			char *fmt, ...)
 {
@@ -71,6 +71,30 @@ clib_mem_vm_map_shared (void *base, uword size, int fd, uword offset,
   return rv;
 }
 
+u8 *
+format_clib_mem_page_stats (u8 * s, va_list * va)
+{
+  clib_mem_page_stats_t *stats = va_arg (*va, clib_mem_page_stats_t *);
+  u32 indent = format_get_indent (s) + 2;
+
+  s = format (s, "page stats: page-size %U, total %lu, mapped %lu, "
+	      "not-mapped %lu", format_log2_page_size, stats->log2_page_sz,
+	      stats->total, stats->mapped, stats->not_mapped);
+
+  if (stats->unknown)
+    s = format (s, ", unknown %lu", stats->unknown);
+
+  for (int i = 0; i < CLIB_MAX_NUMAS; i++)
+    if (stats->per_numa[i])
+      s = format (s, "\n%Unuma %u: %lu pages, %U bytes",
+		  format_white_space, indent, i,
+		  stats->per_numa[i],
+		  format_memory_size,
+		  stats->per_numa[i] << stats->log2_page_sz);
+
+  return s;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *