Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
dpdk/ipsec: coverity fixes
[vpp.git]
/
src
/
vlib
/
main.c
diff --git
a/src/vlib/main.c
b/src/vlib/main.c
index
19d7023
..
7875f62
100644
(file)
--- a/
src/vlib/main.c
+++ b/
src/vlib/main.c
@@
-43,6
+43,7
@@
#include <vlib/threads.h>
#include <vppinfra/tw_timer_1t_3w_1024sl_ov.h>
#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;
#include <vlib/unix/cj.h>
CJ_GLOBAL_LOG_PROTOTYPE;
@@
-137,19
+138,12
@@
vlib_frame_alloc_to_node (vlib_main_t * vm, u32 to_node_index,
else
{
f = clib_mem_alloc_aligned_no_fail (n, VLIB_FRAME_ALIGN);
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)
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. */
{
/* Insert magic number. */
{
@@
-466,7
+460,7
@@
vlib_put_next_frame (vlib_main_t * vm,
vlib_frame_t *f;
u32 n_vectors_in_frame;
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);
vlib_put_next_frame_validate (vm, r, next_index, n_vectors_left);
nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
@@
-1711,8
+1705,17
@@
vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
if (!vm->name)
vm->name = "VLIB";
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)))
{
if ((error = vlib_thread_init (vm)))
{