Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IP6-MFIB: replace the radix tree with bihash (VPP-1526)
[vpp.git]
/
src
/
vpp
/
stats
/
stats_to_be_deprecated.c
diff --git
a/src/vpp/stats/stats_to_be_deprecated.c
b/src/vpp/stats/stats_to_be_deprecated.c
index
94d68c8
..
08117a1
100644
(file)
--- a/
src/vpp/stats/stats_to_be_deprecated.c
+++ b/
src/vpp/stats/stats_to_be_deprecated.c
@@
-221,7
+221,7
@@
dslock (stats_main_t * sm, int release_hint, int tag)
if (release_hint)
l->release_hint++;
if (release_hint)
l->release_hint++;
- while (
__sync_lock_test_and_set (&l->lock, 1
))
+ while (
clib_atomic_test_and_set (&l->lock
))
/* zzzz */ ;
l->tag = tag;
l->thread_index = thread_index;
/* zzzz */ ;
l->tag = tag;
l->thread_index = thread_index;
@@
-870,7
+870,7
@@
do_combined_per_interface_counters (stats_main_t * sm)
continue;
}
mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
continue;
}
mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
- memset (mp, 0, sizeof (*mp));
+
clib_
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id =
ntohs (VL_API_VNET_PER_INTERFACE_COMBINED_COUNTERS);
mp->_vl_msg_id =
ntohs (VL_API_VNET_PER_INTERFACE_COMBINED_COUNTERS);
@@
-1070,7
+1070,7
@@
do_simple_per_interface_counters (stats_main_t * sm)
}
mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
}
mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
- memset (mp, 0, sizeof (*mp));
+
clib_
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_VNET_PER_INTERFACE_SIMPLE_COUNTERS);
/*
mp->_vl_msg_id = ntohs (VL_API_VNET_PER_INTERFACE_SIMPLE_COUNTERS);
/*
@@
-2005,7
+2005,7
@@
do_ip6_fib_counters (stats_main_t * sm)
u32 items_this_message;
vl_api_ip6_fib_counter_t *ctrp = 0;
u32 start_at_fib_index = 0;
u32 items_this_message;
vl_api_ip6_fib_counter_t *ctrp = 0;
u32 start_at_fib_index = 0;
-
BVT (clib_bihash) *
h = &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash;
+
clib_bihash_24_8_t *
h = &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash;
add_routes_in_fib_arg_t _a, *a = &_a;
int i;
add_routes_in_fib_arg_t _a, *a = &_a;
int i;
@@
-2049,7
+2049,7
@@
again:
if (clib_setjmp (&sm->jmp_buf, 0) == 0)
{
start_at_fib_index = fib - im6->fibs;
if (clib_setjmp (&sm->jmp_buf, 0) == 0)
{
start_at_fib_index = fib - im6->fibs;
-
BV (clib_bihash_foreach_key_value_pair)
(h, add_routes_in_fib, a);
+
clib_bihash_foreach_key_value_pair_24_8
(h, add_routes_in_fib, a);
}
else
{
}
else
{
@@
-3046,8
+3046,8
@@
vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
rmp->context = mp->context;
rmp->retval = 0;
rmp->context = mp->context;
rmp->retval = 0;
- memset (total_pkts, 0, sizeof (total_pkts));
- memset (total_bytes, 0, sizeof (total_bytes));
+
clib_
memset (total_pkts, 0, sizeof (total_pkts));
+
clib_
memset (total_bytes, 0, sizeof (total_bytes));
vnet_interface_counter_lock (im);
vnet_interface_counter_lock (im);
@@
-3128,7
+3128,7
@@
stats_init (vlib_main_t * vm)
sm->data_structure_lock =
clib_mem_alloc_aligned (sizeof (data_structure_lock_t),
CLIB_CACHE_LINE_BYTES);
sm->data_structure_lock =
clib_mem_alloc_aligned (sizeof (data_structure_lock_t),
CLIB_CACHE_LINE_BYTES);
- memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
+
clib_
memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
#define _(N,n) \
vl_msg_api_set_handlers(VL_API_##N, #n, \
#define _(N,n) \
vl_msg_api_set_handlers(VL_API_##N, #n, \