X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fthreads.c;h=2f141f10d057d36bb6c7176542d4c9ab0c36f977;hb=bdfe5955f;hp=a6915c5949bef3f53631b4b10b6186b0598b83af;hpb=2ed4204c91bf0c79639f39dc01601d58a0e536ee;p=vpp.git

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index a6915c5949b..2f141f10d05 100644
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -22,13 +22,9 @@
 #include <vlib/vlib.h>
 
 #include <vlib/threads.h>
-#include <vlib/unix/cj.h>
 
 #include <vlib/stat_weak_inlines.h>
 
-DECLARE_CJ_GLOBAL_LOG;
-
-
 u32
 vl (void *p)
 {
@@ -1814,17 +1810,19 @@ vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts)
   vlib_frame_queue_main_t *fqm;
   vlib_frame_queue_t *fq;
   int i;
+  u32 num_threads;
 
   if (frame_queue_nelts == 0)
     frame_queue_nelts = FRAME_QUEUE_MAX_NELTS;
 
-  ASSERT (frame_queue_nelts >= 8);
+  num_threads = 1 /* main thread */  + tm->n_threads;
+  ASSERT (frame_queue_nelts >= 8 + num_threads);
 
   vec_add2 (tm->frame_queue_mains, fqm, 1);
 
   fqm->node_index = node_index;
   fqm->frame_queue_nelts = frame_queue_nelts;
-  fqm->queue_hi_thresh = frame_queue_nelts - 2;
+  fqm->queue_hi_thresh = frame_queue_nelts - num_threads;
 
   vec_validate (fqm->vlib_frame_queues, tm->n_vlib_mains - 1);
   vec_validate (fqm->per_thread_data, tm->n_vlib_mains - 1);