Clean up per-thread mheap setup.

[vpp.git] / vlib / vlib / threads.h

diff --git a/vlib/vlib/threads.h b/vlib/vlib/threads.h
index 07fc1d3..f13d376 100644 (file)
--- a/vlib/vlib/threads.h
+++ b/vlib/vlib/threads.h
@@ -37,20 +37,25 @@ typedef struct vlib_thread_registration_ {
   int fixed_count;
   u32 count;
   int no_data_structure_clone;
+  u32 frame_queue_nelts;
+
   /* All threads of this type run on pthreads */
   int use_pthreads;
   u32 first_index;
   uword * coremask;
 } vlib_thread_registration_t;
 
-#define VLIB_MAX_CPUS 32
-
-/* 
- * Objects passed around by "index" are cache-line aligned.
- * We can stick the owner CPU into the low 6 bits.
+/*
+ * Frames have their cpu / vlib_main_t index in the low-order N bits
+ * Make VLIB_MAX_CPUS a power-of-two, please...
  */
-#if VLIB_MAX_CPUS > 64
-#error VLIB_MAX_CPUS must be <= 64
+
+#ifndef VLIB_MAX_CPUS
+#define VLIB_MAX_CPUS 256
+#endif
+
+#if VLIB_MAX_CPUS > CLIB_MAX_MHEAPS
+#error Please increase number of per-cpu mheaps
 #endif
 
 #define VLIB_CPU_MASK (VLIB_MAX_CPUS - 1) /* 0x3f, max */
@@ -92,6 +97,7 @@ typedef struct {
   u32 instance_id;
   vlib_thread_registration_t *registration;
   u8 *name;
+  u64 barrier_sync_count;
 
   long lwp;
   int dpdk_lcore_id;