Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vlib_mains == 0 special cases be gone
[vpp.git]
/
src
/
vlib
/
node_funcs.h
diff --git
a/src/vlib/node_funcs.h
b/src/vlib/node_funcs.h
index
2116739
..
8ccfc43
100644
(file)
--- a/
src/vlib/node_funcs.h
+++ b/
src/vlib/node_funcs.h
@@
-201,7
+201,7
@@
vlib_get_frame_no_check (vlib_main_t * vm, uword frame_index)
vlib_frame_t *f;
u32 cpu_index = frame_index & VLIB_CPU_MASK;
u32 offset = frame_index & VLIB_OFFSET_MASK;
vlib_frame_t *f;
u32 cpu_index = frame_index & VLIB_CPU_MASK;
u32 offset = frame_index & VLIB_OFFSET_MASK;
- vm = vlib_mains
? vlib_mains[cpu_index] : vm
;
+ vm = vlib_mains
[cpu_index]
;
f = vm->heap_base + offset;
return f;
}
f = vm->heap_base + offset;
return f;
}
@@
-213,7
+213,7
@@
vlib_frame_index_no_check (vlib_main_t * vm, vlib_frame_t * f)
ASSERT (((uword) f & VLIB_CPU_MASK) == 0);
ASSERT (((uword) f & VLIB_CPU_MASK) == 0);
- vm = vlib_mains
? vlib_mains[f->cpu_index] : vm
;
+ vm = vlib_mains
[f->cpu_index]
;
i = ((u8 *) f - (u8 *) vm->heap_base);
return i | f->cpu_index;
i = ((u8 *) f - (u8 *) vm->heap_base);
return i | f->cpu_index;
@@
-476,7
+476,7
@@
vlib_process_get_event_data (vlib_main_t * vm,
vlib_node_main_t *nm = &vm->node_main;
vlib_process_t *p;
vlib_process_event_type_t *et;
vlib_node_main_t *nm = &vm->node_main;
vlib_process_t *p;
vlib_process_event_type_t *et;
- uword t
, l
;
+ uword t;
void *event_data_vector;
p = vec_elt (nm->processes, nm->current_process_index);
void *event_data_vector;
p = vec_elt (nm->processes, nm->current_process_index);
@@
-490,8
+490,7
@@
vlib_process_get_event_data (vlib_main_t * vm,
p->non_empty_event_type_bitmap =
clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
p->non_empty_event_type_bitmap =
clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
- l = _vec_len (p->pending_event_data_by_type_index[t]);
- ASSERT (l > 0);
+ ASSERT (_vec_len (p->pending_event_data_by_type_index[t]) > 0);
event_data_vector = p->pending_event_data_by_type_index[t];
p->pending_event_data_by_type_index[t] = 0;
event_data_vector = p->pending_event_data_by_type_index[t];
p->pending_event_data_by_type_index[t] = 0;