Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VOM: mroutes
[vpp.git]
/
src
/
vlib
/
main.h
diff --git
a/src/vlib/main.h
b/src/vlib/main.h
index
7c34fb6
..
474756b
100644
(file)
--- a/
src/vlib/main.h
+++ b/
src/vlib/main.h
@@
-47,6
+47,7
@@
#include <vppinfra/random_buffer.h>
#include <vppinfra/time.h>
#include <vppinfra/pmc.h>
#include <vppinfra/random_buffer.h>
#include <vppinfra/time.h>
#include <vppinfra/pmc.h>
+#include <vppinfra/pcap.h>
#include <pthread.h>
#include <pthread.h>
@@
-130,6
+131,11
@@
typedef struct vlib_main_t
/* Packet trace buffer. */
vlib_trace_main_t trace_main;
/* Packet trace buffer. */
vlib_trace_main_t trace_main;
+ /* Pcap dispatch trace main */
+ pcap_main_t dispatch_pcap_main;
+ uword dispatch_pcap_enable;
+ u8 *pcap_buffer;
+
/* Error handling. */
vlib_error_main_t error_main;
/* Error handling. */
vlib_error_main_t error_main;
@@
-207,8
+213,10
@@
typedef struct vlib_main_t
/* Earliest barrier can be closed again */
f64 barrier_no_close_before;
/* Earliest barrier can be closed again */
f64 barrier_no_close_before;
- /*
Vector of pending RPC requests
*/
+ /*
RPC requests, main thread only
*/
uword *pending_rpc_requests;
uword *pending_rpc_requests;
+ uword *processing_rpc_requests;
+ clib_spinlock_t pending_rpc_lock;
} vlib_main_t;
} vlib_main_t;
@@
-364,6
+372,9
@@
u32 vlib_app_num_thread_stacks_needed (void) __attribute__ ((weak));
extern void vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n);
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
+
#endif /* included_vlib_main_h */
/*
#endif /* included_vlib_main_h */
/*