X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvlib%2Fmain.h;h=9b6311601d3c552cb48f3c64b4ba3b830db196c9;hb=0647cf22f8a8fff87f993e7a1d2eb1a5dbb1bdfe;hp=4c6d0f490dd0ed1bbb86f6c0e7462498d6d96894;hpb=ec595ef02639005b34334097af76b41ceef3dca5;p=vpp.git

diff --git a/src/vlib/main.h b/src/vlib/main.h
index 4c6d0f490dd..9b6311601d3 100644
--- a/src/vlib/main.h
+++ b/src/vlib/main.h
@@ -58,11 +58,21 @@
 #define VLIB_ELOG_MAIN_LOOP 0
 #endif
 
+typedef struct
+{
+  int pcap_enable;
+  u32 pcap_sw_if_index;
+  pcap_main_t pcap_main;
+} vnet_pcap_t;
+
 typedef struct vlib_main_t
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   /* Instruction level timing state. */
   clib_time_t clib_time;
+  /* Offset from main thread time */
+  f64 time_offset;
+  f64 time_last_barrier_release;
 
   /* Time stamp of last node dispatch. */
   u64 cpu_time_last_node_dispatch;
@@ -84,9 +94,14 @@ typedef struct vlib_main_t
   u32 node_counts_per_main_loop[2];
 
   /* Main loop hw / sw performance counters */
-  void (*vlib_node_runtime_perf_counter_cb) (struct vlib_main_t *,
-					     u64 *, u64 *);
-
+  void (**vlib_node_runtime_perf_counter_cbs) (struct vlib_main_t *,
+					       u64 *, u64 *,
+					       vlib_node_runtime_t *,
+					       vlib_frame_t *, int);
+  void (**vlib_node_runtime_perf_counter_cb_tmp) (struct vlib_main_t *,
+						  u64 *, u64 *,
+						  vlib_node_runtime_t *,
+						  vlib_frame_t *, int);
   /* Every so often we switch to the next counter. */
 #define VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE 7
 
@@ -115,9 +130,6 @@ typedef struct vlib_main_t
   /* Size of the heap */
   uword heap_size;
 
-  /* Pool of buffer free lists. */
-  vlib_buffer_free_list_t *buffer_free_list_pool;
-
   /* buffer main structure. */
   vlib_buffer_main_t *buffer_main;
 
@@ -138,6 +150,15 @@ typedef struct vlib_main_t
   uword dispatch_pcap_enable;
   u8 *pcap_buffer;
 
+  /* pcap rx / tx tracing */
+  vnet_pcap_t pcap[VLIB_N_RX_TX];
+
+  int pcap_enable;
+  pcap_main_t pcap_main;
+  u8 *pcap_filename;
+  u32 pcap_sw_if_index;
+  u32 pcap_pkts_to_capture;
+
   /* Error handling. */
   vlib_error_main_t error_main;
 
@@ -158,6 +179,9 @@ typedef struct vlib_main_t
   /* Event logger trace flags */
   int elog_trace_api_messages;
   int elog_trace_cli_commands;
+  int elog_trace_graph_dispatch;
+  int elog_trace_graph_circuit;
+  u32 elog_trace_graph_circuit_node_index;
 
   /* Node call and return event types. */
   elog_event_type_t *node_call_elog_event_types;
@@ -176,7 +200,7 @@ typedef struct vlib_main_t
 
   /* thread, cpu and numa_node indices */
   u32 thread_index;
-  u32 cpu_index;
+  u32 cpu_id;
   u32 numa_node;
 
   /* List of init functions to call, setup by constructors */
@@ -194,7 +218,10 @@ typedef struct vlib_main_t
   u8 **argv;
 
   /* Top of (worker) dispatch loop callback */
-  volatile void (*worker_thread_main_loop_callback) (struct vlib_main_t *);
+  void (**volatile worker_thread_main_loop_callbacks) (struct vlib_main_t *);
+  void (**volatile worker_thread_main_loop_callback_tmp)
+    (struct vlib_main_t *);
+  clib_spinlock_t worker_thread_main_loop_callback_lock;
 
   /* debugging */
   volatile int parked_at_barrier;
@@ -217,6 +244,9 @@ typedef struct vlib_main_t
   /* Earliest barrier can be closed again */
   f64 barrier_no_close_before;
 
+  /* Need to check the frame queues */
+  volatile uword check_frame_queues;
+
   /* RPC requests, main thread only */
   uword *pending_rpc_requests;
   uword *processing_rpc_requests;
@@ -232,7 +262,7 @@ void vlib_worker_loop (vlib_main_t * vm);
 always_inline f64
 vlib_time_now (vlib_main_t * vm)
 {
-  return clib_time_now (&vm->clib_time);
+  return clib_time_now (&vm->clib_time) + vm->time_offset;
 }
 
 always_inline f64