X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fthreads_cli.c;h=bcb85ec69fbb30e1e7b685997d9472944779b99b;hb=a690fdbfe179e0ea65818c03b52535bf9210efd0;hp=f8d5d8f9ad28f7fb33ad25162cf8952c80ac0f27;hpb=3b64d6334b4e8d0759cff043a55042f88d1ccb0e;p=vpp.git

diff --git a/src/vlib/threads_cli.c b/src/vlib/threads_cli.c
index f8d5d8f9ad2..bcb85ec69fb 100644
--- a/src/vlib/threads_cli.c
+++ b/src/vlib/threads_cli.c
@@ -18,7 +18,6 @@
 #include <vlib/vlib.h>
 
 #include <vlib/threads.h>
-#include <vlib/linux/sysfs.h>
 #include <vlib/unix/unix.h>
 
 static u8 *
@@ -64,57 +63,16 @@ show_threads_fn (vlib_main_t * vm,
 
       line = format (line, "%-25U", format_sched_policy_and_priority, w->lwp);
 
-      int lcore = -1;
-      cpu_set_t cpuset;
-      CPU_ZERO (&cpuset);
-      int ret = -1;
-
-      ret =
-	pthread_getaffinity_np (w->thread_id, sizeof (cpu_set_t), &cpuset);
-      if (!ret)
-	{
-	  int c;
-	  for (c = 0; c < CPU_SETSIZE; c++)
-	    if (CPU_ISSET (c, &cpuset))
-	      {
-		if (lcore > -1)
-		  {
-		    lcore = -2;
-		    break;
-		  }
-		lcore = c;
-	      }
-	}
-      else
+      int cpu_id = w->cpu_id;
+      if (cpu_id > -1)
 	{
-	  lcore = w->lcore_id;
-	}
-
-      if (lcore > -1)
-	{
-	  const char *sys_cpu_path = "/sys/devices/system/cpu/cpu";
-	  int socket_id = -1;
-	  int core_id = -1;
-	  u8 *p = 0;
-
-	  p = format (p, "%s%u/topology/core_id%c", sys_cpu_path, lcore, 0);
-	  vlib_sysfs_read ((char *) p, "%d", &core_id);
-
-	  vec_reset_length (p);
-	  p =
-	    format (p,
-		    "%s%u/topology/physical_package_id%c",
-		    sys_cpu_path, lcore, 0);
-	  vlib_sysfs_read ((char *) p, "%d", &socket_id);
-	  vec_free (p);
-
-	  line = format (line, "%-7u%-7u%-7u%", lcore, core_id, socket_id);
+	  int core_id = w->core_id;
+	  int numa_id = w->numa_id;
+	  line = format (line, "%-7u%-7u%-7u%", cpu_id, core_id, numa_id);
 	}
       else
 	{
-	  line =
-	    format (line, "%-7s%-7s%-7s%", (lcore == -2) ? "M" : "n/a", "n/a",
-		    "n/a");
+	  line = format (line, "%-7s%-7s%-7s%", "n/a", "n/a", "n/a");
 	}
 
       vlib_cli_output (vm, "%v", line);
@@ -210,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;
     }
 
@@ -574,7 +532,6 @@ VLIB_CLI_COMMAND (cmd_test_frame_queue_threshold,static) = {
 };
 /* *INDENT-ON* */
 
-
 /*
  * fd.io coding-style-patch-verification: ON
  *