#include <vlib/threads.h>
#include <vppinfra/tw_timer_1t_3w_1024sl_ov.h>
+#include <vlib/unix/unix.h>
#include <vlib/unix/cj.h>
CJ_GLOBAL_LOG_PROTOTYPE;
else
{
f = clib_mem_alloc_aligned_no_fail (n, VLIB_FRAME_ALIGN);
- f->thread_index = vm->thread_index;
fi = vlib_frame_index_no_check (vm, f);
}
/* Poison frame when debugging. */
if (CLIB_DEBUG > 0)
- {
- u32 save_thread_index = f->thread_index;
-
- memset (f, 0xfe, n);
-
- f->thread_index = save_thread_index;
- }
+ memset (f, 0xfe, n);
/* Insert magic number. */
{
vlib_frame_t *f;
u32 n_vectors_in_frame;
- if (vm->buffer_main->extern_buffer_mgmt == 0 && CLIB_DEBUG > 0)
+ if (vm->buffer_main->callbacks_registered == 0 && CLIB_DEBUG > 0)
vlib_put_next_frame_validate (vm, r, next_index, n_vectors_left);
nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
/* data to log */ n_vectors);
}
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+void (*vlib_buffer_trace_trajectory_cb) (vlib_buffer_t * b, u32 node_index);
+void (*vlib_buffer_trace_trajectory_init_cb) (vlib_buffer_t * b);
+
void
-vlib_dump_context_trace (vlib_main_t * vm, u32 bi)
+vlib_buffer_trace_trajectory_init (vlib_buffer_t * b)
{
- vlib_node_main_t *vnm = &vm->node_main;
- vlib_buffer_t *b;
- u8 i, n;
-
- if (VLIB_BUFFER_TRACE_TRAJECTORY)
+ if (PREDICT_TRUE (vlib_buffer_trace_trajectory_init_cb != 0))
{
- b = vlib_get_buffer (vm, bi);
- n = b->pre_data[0];
-
- fformat (stderr, "Context trace for bi %d b 0x%llx, visited %d\n",
- bi, b, n);
-
- if (n == 0 || n > 20)
- {
- fformat (stderr, "n is unreasonable\n");
- return;
- }
-
-
- for (i = 0; i < n; i++)
- {
- u32 node_index;
-
- node_index = b->pre_data[i + 1];
+ (*vlib_buffer_trace_trajectory_init_cb) (b);
+ }
+}
- if (node_index > vec_len (vnm->nodes))
- {
- fformat (stderr, "Skip bogus node index %d\n", node_index);
- continue;
- }
+#endif
- fformat (stderr, "%v (%d)\n", vnm->nodes[node_index]->name,
- node_index);
- }
- }
- else
+static inline void
+add_trajectory_trace (vlib_buffer_t * b, u32 node_index)
+{
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+ if (PREDICT_TRUE (vlib_buffer_trace_trajectory_cb != 0))
{
- fformat (stderr,
- "in vlib/buffers.h, #define VLIB_BUFFER_TRACE_TRAJECTORY 1\n");
+ (*vlib_buffer_trace_trajectory_cb) (b, node_index);
}
+#endif
}
-
static_always_inline u64
dispatch_node (vlib_main_t * vm,
vlib_node_runtime_t * node,
if (VLIB_BUFFER_TRACE_TRAJECTORY && frame)
{
int i;
- int log_index;
u32 *from;
from = vlib_frame_vector_args (frame);
for (i = 0; i < frame->n_vectors; i++)
{
vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
- ASSERT (b->pre_data[0] < 32);
- log_index = b->pre_data[0]++ + 1;
- b->pre_data[log_index] = node->node_index;
+ add_trajectory_trace (b, node->node_index);
}
n = node->function (vm, node, frame);
}
if (!vm->name)
vm->name = "VLIB";
- vec_validate (vm->buffer_main, 0);
- vlib_buffer_cb_init (vm);
+ if ((error = unix_physmem_init (vm)))
+ {
+ clib_error_report (error);
+ goto done;
+ }
+
+ if ((error = vlib_buffer_main_init (vm)))
+ {
+ clib_error_report (error);
+ goto done;
+ }
if ((error = vlib_thread_init (vm)))
{