X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fmain.h;h=ce42b6ea442c7ed25ea79bf3d7386d3e56e30973;hb=c3a06556d1a4a63646d4cc7aa76274177a56c13f;hp=2eec930e9b6bc0379447bfb325192ab28bf7eb69;hpb=88c062119b5e94ef19e02f007e38ee119b02218f;p=vpp.git

diff --git a/src/vlib/main.h b/src/vlib/main.h
index 2eec930e9b6..ce42b6ea442 100644
--- a/src/vlib/main.h
+++ b/src/vlib/main.h
@@ -58,6 +58,7 @@
 
 typedef struct vlib_main_t
 {
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   /* Instruction level timing state. */
   clib_time_t clib_time;
 
@@ -99,11 +100,17 @@ typedef struct vlib_main_t
   /* Name for e.g. syslog. */
   char *name;
 
-  /* Start and size of CLIB heap. */
+  /* Start of the heap. */
   void *heap_base;
+
+  /* Truncated version, to create frame indices */
+  void *heap_aligned_base;
+
+  /* Size of the heap */
   uword heap_size;
 
-  vlib_buffer_main_t *buffer_main;
+  /* Pool of buffer free lists. */
+  vlib_buffer_free_list_t *buffer_free_list_pool;
 
   /* Allocate/free buffer memory for DMA transfers, descriptor rings, etc.
      buffer memory is guaranteed to be cache-aligned. */
@@ -141,9 +148,6 @@ typedef struct vlib_main_t
 			 struct vlib_node_runtime_t * node,
 			 vlib_frame_t * frame);
 
-  /* Multicast distribution.  Set to zero for MC disabled. */
-  mc_main_t *mc_main;
-
   /* Stream index to use for distribution when MC is enabled. */
   u32 mc_stream_index;
 
@@ -152,6 +156,10 @@ typedef struct vlib_main_t
   /* Event logger. */
   elog_main_t elog_main;
 
+  /* Event logger trace flags */
+  int elog_trace_api_messages;
+  int elog_trace_cli_commands;
+
   /* Node call and return event types. */
   elog_event_type_t *node_call_elog_event_types;
   elog_event_type_t *node_return_elog_event_types;
@@ -170,8 +178,6 @@ typedef struct vlib_main_t
   /* to compare with node runtime */
   u32 thread_index;
 
-  void **mbuf_alloc_list;
-
   /* List of init functions to call, setup by constructors */
   _vlib_init_function_list_elt_t *init_function_registrations;
   _vlib_init_function_list_elt_t *worker_init_function_registrations;
@@ -179,7 +185,6 @@ typedef struct vlib_main_t
   _vlib_init_function_list_elt_t *main_loop_exit_function_registrations;
   _vlib_init_function_list_elt_t *api_init_function_registrations;
   vlib_config_function_runtime_t *config_function_registrations;
-  mc_serialize_msg_t *mc_msg_registrations;	/* mc_main is a pointer... */
 
   /* control-plane API queue signal pending, length indication */
   volatile u32 queue_signal_pending;