Improve cpu { coremask-% } configure option

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

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index c53c5d6..8e75592 100644 (file)
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -24,7 +24,7 @@
 
 DECLARE_CJ_GLOBAL_LOG;
 
-#define FRAME_QUEUE_NELTS 32
+#define FRAME_QUEUE_NELTS 64
 
 u32
 vl (void *p)
@@ -1267,7 +1267,6 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
   uword *p;
   vlib_thread_main_t *tm = &vlib_thread_main;
   u8 *name;
-  u64 coremask;
   uword *bitmap;
   u32 count;
 
@@ -1296,25 +1295,10 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
        ;
       else if (unformat (input, "skip-cores %u", &tm->skip_cores))
        ;
-      else if (unformat (input, "coremask-%s %llx", &name, &coremask))
-       {
-         p = hash_get_mem (tm->thread_registrations_by_name, name);
-         if (p == 0)
-           return clib_error_return (0, "no such thread type '%s'", name);
-
-         tr = (vlib_thread_registration_t *) p[0];
-
-         if (tr->use_pthreads)
-           return clib_error_return (0,
-                                     "coremask cannot be set for '%s' threads",
-                                     name);
-
-         tr->coremask = clib_bitmap_set_multiple
-           (tr->coremask, 0, coremask, BITS (coremask));
-         tr->count = clib_bitmap_count_set_bits (tr->coremask);
-       }
-      else if (unformat (input, "corelist-%s %U", &name, unformat_bitmap_list,
-                        &bitmap))
+      else if (unformat (input, "coremask-%s %U", &name,
+                        unformat_bitmap_mask, &bitmap) ||
+              unformat (input, "corelist-%s %U", &name,
+                        unformat_bitmap_list, &bitmap))
        {
          p = hash_get_mem (tm->thread_registrations_by_name, name);
          if (p == 0)
@@ -1795,16 +1779,29 @@ vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts)
   if (frame_queue_nelts == 0)
     frame_queue_nelts = FRAME_QUEUE_NELTS;
 
+  ASSERT (frame_queue_nelts >= 8);
+
   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;
 
   vec_validate (fqm->vlib_frame_queues, tm->n_vlib_mains - 1);
+  vec_validate (fqm->per_thread_data, tm->n_vlib_mains - 1);
   _vec_len (fqm->vlib_frame_queues) = 0;
   for (i = 0; i < tm->n_vlib_mains; i++)
     {
+      vlib_frame_queue_per_thread_data_t *ptd;
       fq = vlib_frame_queue_alloc (frame_queue_nelts);
       vec_add1 (fqm->vlib_frame_queues, fq);
+
+      ptd = vec_elt_at_index (fqm->per_thread_data, i);
+      vec_validate (ptd->handoff_queue_elt_by_thread_index,
+                   tm->n_vlib_mains - 1);
+      vec_validate_init_empty (ptd->congested_handoff_queue_by_thread_index,
+                              tm->n_vlib_mains - 1,
+                              (vlib_frame_queue_t *) (~0));
     }
 
   return (fqm - tm->frame_queue_mains);