nat: NAT44 ED improvements and fixes

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

diff --git a/src/vlib/threads_cli.c b/src/vlib/threads_cli.c
index 86c0247..d14e9c5 100644 (file)
--- a/src/vlib/threads_cli.c
+++ b/src/vlib/threads_cli.c
@@ -67,8 +67,8 @@ show_threads_fn (vlib_main_t * vm,
       if (cpu_id > -1)
        {
          int core_id = w->core_id;
-         int socket_id = w->socket_id;
-         line = format (line, "%-7u%-7u%-7u%", cpu_id, core_id, socket_id);
+         int numa_id = w->numa_id;
+         line = format (line, "%-7u%-7u%-7u%", cpu_id, core_id, numa_id);
        }
       else
        {
@@ -168,9 +168,9 @@ trace_frame_queue (vlib_main_t * vm, unformat_input_t * input,
       fqt = &fqm->frame_queue_traces[fqix];
       fqh = &fqm->frame_queue_histogram[fqix];
 
-      memset (fqt->n_vectors, 0xff, sizeof (fqt->n_vectors));
+      clib_memset (fqt->n_vectors, 0xff, sizeof (fqt->n_vectors));
       fqt->written = 0;
-      memset (fqh, 0, sizeof (*fqh));
+      clib_memset (fqh, 0, sizeof (*fqh));
       fqm->vlib_frame_queues[fqix]->trace = enable;
     }
 
@@ -290,8 +290,8 @@ show_frame_queue_internal (vlib_main_t * vm,
          vlib_cli_output (vm,
                           "  vector-threshold %d  ring size %d  in use %d\n",
                           fqt->threshold, fqt->nelts, fqt->n_in_use);
-         vlib_cli_output (vm, "  head %12d  head_hint %12d  tail %12d\n",
-                          fqt->head, fqt->head_hint, fqt->tail);
+         vlib_cli_output (vm, "  head %12d  tail %12d\n", fqt->head,
+                          fqt->tail);
          vlib_cli_output (vm,
                           "  %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
                           fqt->n_vectors[0], fqt->n_vectors[1],