summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Boon <gboon@cisco.com>2019-05-03 13:30:14 -0400
committerDave Barach <openvpp@barachs.net>2019-05-03 19:26:49 +0000
commit4681e07a02c2e1681048c4e3a018433c055a91b1 (patch)
tree2f99a34616278a620f877b188eb506f5f58a6d4b
parentc5fa2b8099ea1fe18a5df3c71ad6a16df242431e (diff)
Add callbacks for extended trace functionality, one as content is added with vlib_add_trace, and one to post-process the captured content immediately after trace filtering.
Change-Id: Ieb521686d8c0e7ce1a0ef325f7abdde613e1eb9c Signed-off-by: Gary Boon <gboon@cisco.com>
-rw-r--r--src/vlib/trace.h21
-rw-r--r--src/vlib/trace_funcs.h13
2 files changed, 33 insertions, 1 deletions
diff --git a/src/vlib/trace.h b/src/vlib/trace.h
index b5634031f96..f83a6d11e51 100644
--- a/src/vlib/trace.h
+++ b/src/vlib/trace.h
@@ -66,6 +66,20 @@ typedef struct
u32 limit;
} vlib_trace_node_t;
+/* Callback type for post-processing the vlib trace buffer */
+struct vlib_main_t;
+struct vlib_trace_main_t;
+typedef void (vlib_trace_buffer_callback_t) (struct vlib_main_t *,
+ struct vlib_trace_main_t *);
+
+/* Callback type for alternate handling of vlib_add_trace internals */
+struct vlib_node_runtime_t;
+struct vlib_buffer_t;
+typedef void *(vlib_add_trace_callback_t) (struct vlib_main_t *,
+ struct vlib_node_runtime_t * r,
+ struct vlib_buffer_t * b,
+ u32 n_data_bytes);
+
typedef struct
{
/* Pool of trace buffers. */
@@ -87,6 +101,13 @@ typedef struct
/* verbosity */
int verbose;
+
+ /* a callback to enable customized consumption of the trace buffer content */
+ vlib_trace_buffer_callback_t *trace_buffer_callback;
+
+ /* a callback to enable customized addition of a new trace */
+ vlib_add_trace_callback_t *add_trace_callback;
+
} vlib_trace_main_t;
format_function_t format_vlib_trace;
diff --git a/src/vlib/trace_funcs.h b/src/vlib/trace_funcs.h
index eb06799305c..56cbfc7b6a2 100644
--- a/src/vlib/trace_funcs.h
+++ b/src/vlib/trace_funcs.h
@@ -63,7 +63,14 @@ vlib_add_trace (vlib_main_t * vm,
ASSERT (vnet_trace_dummy);
- if (PREDICT_FALSE (tm->trace_enable == 0))
+ if (PREDICT_FALSE (tm->add_trace_callback != 0))
+ {
+ return tm->add_trace_callback ((struct vlib_main_t *) vm,
+ (struct vlib_node_runtime_t *) r,
+ (struct vlib_buffer_t *) b,
+ n_data_bytes);
+ }
+ else if (PREDICT_FALSE (tm->trace_enable == 0))
{
ASSERT (vec_len (vnet_trace_dummy) >= n_data_bytes + sizeof (*h));
return vnet_trace_dummy;
@@ -129,6 +136,10 @@ vlib_trace_buffer (vlib_main_t * vm,
{
tm->last_main_loop_count = vm->main_loop_count;
trace_apply_filter (vm);
+
+ if (tm->trace_buffer_callback)
+ (tm->trace_buffer_callback) ((struct vlib_main_t *) vm,
+ (struct vlib_trace_main_t *) tm);
}
vlib_trace_next_frame (vm, r, next_index);