From: Damjan Marion <damarion@cisco.com>
Date: Tue, 3 Jul 2018 20:24:32 +0000 (+0200)
Subject: Do not override skip-cores if set in startup.conf
X-Git-Tag: v18.07-rc1~54
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9e300dda1b6227c0c67aeafee4d381f06076729c;p=vpp.git

Do not override skip-cores if set in startup.conf

Change-Id: I97d75f58a46275fdad5add27dc59c731cc3ac64d
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 4e4f13eae86..c17fde4bfec 100644
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -338,10 +338,8 @@ vlib_thread_init (vlib_main_t * vm)
   avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap);
 
   /* by default we skip core 0, unless it is the only one available */
-  if (tm->skip_cores == ~0 && clib_bitmap_count_set_bits (avail_cpu) == 1)
-    tm->skip_cores = 0;
-  else
-    tm->skip_cores = 1;
+  if (tm->skip_cores == ~0)
+    tm->skip_cores = (clib_bitmap_count_set_bits (avail_cpu) < 2) ? 0 : 1;
 
   /* skip cores */
   for (i = 0; i < tm->skip_cores; i++)