ikev2: test responder behind NAT

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

diff --git a/src/vlib/cli.c b/src/vlib/cli.c
index 223a3b7..c6f71a5 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);
@@ -703,6 +703,11 @@ vlib_cli_output (vlib_main_t * vm, char *fmt, ...)
   s = va_format (0, fmt, &va);
   va_end (va);
 
+  /* some format functions might return 0
+   * e.g. show int addr */
+  if (NULL == s)
+    return;
+
   /* Terminate with \n if not present. */
   if (vec_len (s) > 0 && s[vec_len (s) - 1] != '\n')
     vec_add1 (s, '\n');
@@ -781,8 +786,7 @@ show_memory_usage (vlib_main_t * vm,
     {
       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);
 
@@ -798,8 +802,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);
@@ -829,17 +832,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++;
@@ -851,9 +846,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)
@@ -864,14 +856,9 @@ 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);
          }
       }
@@ -882,8 +869,8 @@ show_memory_usage (vlib_main_t * vm,
        u8 *s = 0;
        int numa = -1;
 
-       s = format (s, "\n%-16s%7s%7s%7s",
-                   "StartAddr", "size", "PageSz", "Pages");
+       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");
@@ -896,9 +883,16 @@ show_memory_usage (vlib_main_t * vm,
            clib_mem_get_page_stats ((void *) hdr->base_addr,
                                     hdr->log2_page_sz, hdr->num_pages,
                                     &stats);
-           s = format (s, "%016lx%7U%7U%7lu",
+           s = format (s, "%016lx%7U",
                        hdr->base_addr, format_memory_size,
-                       hdr->num_pages << hdr->log2_page_sz,
+                       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)
@@ -1483,8 +1477,9 @@ done:
 #endif
 
 static clib_error_t *
-elog_trace_command_fn (vlib_main_t * vm,
-                      unformat_input_t * input, vlib_cli_command_t * cmd)
+event_logger_trace_command_fn (vlib_main_t * vm,
+                              unformat_input_t * input,
+                              vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
   int enable = 1;
@@ -1573,21 +1568,20 @@ print_status:
  *
  * @cliexpar
  * @clistart
- * elog trace api cli barrier
- * elog trace api cli barrier disable
- * elog trace dispatch
- * elog trace circuit-node ethernet-input
- * elog trace
+ * event-logger trace api cli barrier
+ * event-logger trace api cli barrier disable
+ * event-logger trace dispatch
+ * event-logger trace circuit-node ethernet-input
  * @cliend
- * @cliexcmd{elog trace [api][cli][barrier][disable]}
+ * @cliexcmd{event-logger trace [api][cli][barrier][disable]}
 ?*/
 /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_trace_command, static) =
+VLIB_CLI_COMMAND (event_logger_trace_command, static) =
 {
-  .path = "elog trace",
-  .short_help = "elog trace [api][cli][barrier][dispatch]\n"
+  .path = "event-logger trace",
+  .short_help = "event-logger trace [api][cli][barrier][dispatch]\n"
   "[circuit-node <name> e.g. ethernet-input][disable]",
-  .function = elog_trace_command_fn,
+  .function = event_logger_trace_command_fn,
 };
 /* *INDENT-ON* */