misc: deprecate VOM

[vpp.git] / src / vlib / cli.c

diff --git a/src/vlib/cli.c b/src/vlib/cli.c
index 2bdc98c..a88bd3a 100644 (file)
--- a/src/vlib/cli.c
+++ b/src/vlib/cli.c
@@ -507,7 +507,7 @@ vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
        }
 
       (void) clib_mem_trace_enable_disable (0);
-      leak_report = format (0, "%U", format_mheap, clib_mem_get_heap (),
+      leak_report = format (0, "%U", format_clib_mem_heap, 0,
                            1 /* verbose, i.e. print leaks */ );
       clib_mem_trace (0);
       vlib_cli_output (vm, "%v", leak_report);
@@ -742,6 +742,7 @@ show_memory_usage (vlib_main_t * vm,
   clib_mem_main_t *mm = &clib_mem_main;
   int verbose __attribute__ ((unused)) = 0;
   int api_segment = 0, stats_segment = 0, main_heap = 0, numa_heaps = 0;
+  int map = 0;
   clib_error_t *error;
   u32 index = 0;
   int i;
@@ -761,6 +762,8 @@ show_memory_usage (vlib_main_t * vm,
        main_heap = 1;
       else if (unformat (input, "numa-heaps"))
        numa_heaps = 1;
+      else if (unformat (input, "map"))
+       map = 1;
       else
        {
          error = clib_error_return (0, "unknown input `%U'",
@@ -769,16 +772,16 @@ show_memory_usage (vlib_main_t * vm,
        }
     }
 
-  if ((api_segment + stats_segment + main_heap + numa_heaps) == 0)
+  if ((api_segment + stats_segment + main_heap + numa_heaps + map) == 0)
     return clib_error_return
-      (0, "Need one of api-segment, stats-segment, main-heap or numa-heaps");
+      (0, "Need one of api-segment, stats-segment, main-heap, numa-heaps "
+       "or map");
 
   if (api_segment)
     {
       void *oldheap = vl_msg_push_heap ();
       was_enabled = clib_mem_trace_enable_disable (0);
-      u8 *s_in_svm =
-       format (0, "%U\n", format_mheap, clib_mem_get_heap (), 1);
+      u8 *s_in_svm = format (0, "%U\n", format_clib_mem_heap, 0, 1);
       vl_msg_pop_heap (oldheap);
       u8 *s = vec_dup (s_in_svm);
 
@@ -794,8 +797,7 @@ show_memory_usage (vlib_main_t * vm,
     {
       void *oldheap = vlib_stats_push_heap (0);
       was_enabled = clib_mem_trace_enable_disable (0);
-      u8 *s_in_svm =
-       format (0, "%U\n", format_mheap, clib_mem_get_heap (), 1);
+      u8 *s_in_svm = format (0, "%U\n", format_clib_mem_heap, 0, 1);
       if (oldheap)
        clib_mem_set_heap (oldheap);
       u8 *s = vec_dup (s_in_svm);
@@ -825,17 +827,9 @@ show_memory_usage (vlib_main_t * vm,
         /* *INDENT-OFF* */
         foreach_vlib_main (
         ({
-          struct dlmallinfo mi;
-          void *mspace;
-          mspace = mm->per_cpu_mheaps[index];
-
-          mi = mspace_mallinfo (mspace);
           vlib_cli_output (vm, "%sThread %d %s\n", index ? "\n":"", index,
                            vlib_worker_threads[index].name);
-          vlib_cli_output (vm, "  %U\n", format_page_map,
-                           pointer_to_uword (mspace_least_addr(mspace)),
-                           mi.arena);
-          vlib_cli_output (vm, "  %U\n", format_mheap,
+          vlib_cli_output (vm, "  %U\n", format_clib_mem_heap,
                            mm->per_cpu_mheaps[index],
                            verbose);
           index++;
@@ -847,9 +841,6 @@ show_memory_usage (vlib_main_t * vm,
       }
     if (numa_heaps)
       {
-       struct dlmallinfo mi;
-       void *mspace;
-
        for (i = 0; i < ARRAY_LEN (mm->per_numa_mheaps); i++)
          {
            if (mm->per_numa_mheaps[i] == 0)
@@ -860,17 +851,54 @@ show_memory_usage (vlib_main_t * vm,
                continue;
              }
            was_enabled = clib_mem_trace_enable_disable (0);
-           mspace = mm->per_numa_mheaps[i];
 
-           mi = mspace_mallinfo (mspace);
            vlib_cli_output (vm, "Numa %d:", i);
-           vlib_cli_output (vm, "  %U\n", format_page_map,
-                            pointer_to_uword (mspace_least_addr (mspace)),
-                            mi.arena);
-           vlib_cli_output (vm, "  %U\n", format_mheap,
+           vlib_cli_output (vm, "  %U\n", format_clib_mem_heap,
                             mm->per_numa_mheaps[index], verbose);
          }
       }
+    if (map)
+      {
+       clib_mem_page_stats_t stats = { };
+       clib_mem_vm_map_hdr_t *hdr = 0;
+       u8 *s = 0;
+       int numa = -1;
+
+       s = format (s, "\n%-16s%7s%5s%7s%7s",
+                   "StartAddr", "size", "FD", "PageSz", "Pages");
+       while ((numa = vlib_mem_get_next_numa_node (numa)) != -1)
+         s = format (s, " Numa%u", numa);
+       s = format (s, " NotMap");
+       s = format (s, " Name");
+       vlib_cli_output (vm, "%v", s);
+       vec_reset_length (s);
+
+       while ((hdr = clib_mem_vm_get_next_map_hdr (hdr)))
+         {
+           clib_mem_get_page_stats ((void *) hdr->base_addr,
+                                    hdr->log2_page_sz, hdr->num_pages,
+                                    &stats);
+           s = format (s, "%016lx%7U",
+                       hdr->base_addr, format_memory_size,
+                       hdr->num_pages << hdr->log2_page_sz);
+
+           if (hdr->fd != -1)
+             s = format (s, "%5d", hdr->fd);
+           else
+             s = format (s, "%5s", " ");
+
+           s = format (s, "%7U%7lu",
+                       format_log2_page_size, hdr->log2_page_sz,
+                       hdr->num_pages);
+           while ((numa = vlib_mem_get_next_numa_node (numa)) != -1)
+             s = format (s, "%6lu", stats.per_numa[numa]);
+           s = format (s, "%7lu", stats.not_mapped);
+           s = format (s, " %s", hdr->name);
+           vlib_cli_output (vm, "%v", s);
+           vec_reset_length (s);
+         }
+       vec_free (s);
+      }
   }
   return 0;
 }
@@ -879,7 +907,7 @@ show_memory_usage (vlib_main_t * vm,
 VLIB_CLI_COMMAND (show_memory_usage_command, static) = {
   .path = "show memory",
   .short_help = "show memory [api-segment][stats-segment][verbose]\n"
-  "            [numa-heaps]",
+  "            [numa-heaps][map]",
   .function = show_memory_usage,
 };
 /* *INDENT-ON* */