misc: unify pcap rx / tx / drop trace

[vpp.git] / src / vlib / main.h

diff --git a/src/vlib/main.h b/src/vlib/main.h
index f89ecd3..2b50b4e 100644 (file)
--- a/src/vlib/main.h
+++ b/src/vlib/main.h
@@ -58,11 +58,29 @@
 #define VLIB_ELOG_MAIN_LOOP 0
 #endif
 
+typedef struct
+{
+  /* Trace RX pkts */
+  u8 pcap_rx_enable;
+  /* Trace TX pkts */
+  u8 pcap_tx_enable;
+  /* Trace drop pkts */
+  u8 pcap_drop_enable;
+  u8 pad1;
+  u32 max_bytes_per_pkt;
+  u32 pcap_sw_if_index;
+  pcap_main_t pcap_main;
+  u32 filter_classify_table_index;
+} 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 +102,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
 
@@ -133,8 +156,12 @@ typedef struct vlib_main_t
   /* Pcap dispatch trace main */
   pcap_main_t dispatch_pcap_main;
   uword dispatch_pcap_enable;
+  u32 *dispatch_buffer_trace_nodes;
   u8 *pcap_buffer;
 
+  /* pcap rx / tx tracing */
+  vnet_pcap_t pcap;
+
   /* Error handling. */
   vlib_error_main_t error_main;
 
@@ -194,7 +221,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 +247,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 +265,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
@@ -379,6 +412,18 @@ extern void vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n);
 #define VLIB_PCAP_MAJOR_VERSION 1
 #define VLIB_PCAP_MINOR_VERSION 0
 
+typedef struct
+{
+  u8 *filename;
+  int enable;
+  int status;
+  u32 packets_to_capture;
+  u32 buffer_trace_node_index;
+  u32 buffer_traces_to_capture;
+} vlib_pcap_dispatch_trace_args_t;
+
+int vlib_pcap_dispatch_trace_configure (vlib_pcap_dispatch_trace_args_t *);
+
 #endif /* included_vlib_main_h */
 
 /*