diff options
author | Damjan Marion <damarion@cisco.com> | 2022-03-19 00:07:52 +0100 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2022-03-30 18:27:13 +0000 |
commit | 299571aca34d36e637e43cfbba6275662d0d7795 (patch) | |
tree | a48be21950d082afb7dd93562f76f0ba554e8919 /src/plugins/unittest/counter_test.c | |
parent | 9539647b895c456ca53892a9259e3127c6b92d35 (diff) |
vppinfra: vector allocator rework
- support of in-place growth of vectors (if there is available space next to
existing alloc)
- drops the need for alloc_aligned_at_offset from memory allocator,
which allows easier swap to different memory allocator and reduces
malloc overhead
- rework of pool and vec macros to inline functions to improve debuggability
- fix alignment - in many cases macros were not using native alignment
of the particular datatype. Explicitly setting alignment with XXX_aligned()
versions of the macro is not needed anymore in > 99% of cases
- fix ASAN usage
- avoid use of vector of voids, this was root cause of several bugs
found in vec_* and pool_* function where sizeof() was used on voids
instead of real vector data type
- introduce minimal alignment which is currently 8 bytes, vectors will
be always aligned at least to that value (underlay allocator actually always
provide 16-byte aligned allocs)
Type: improvement
Change-Id: I20f4b081bb13bbf7bc0ace85cc4e301787f12fdf
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/unittest/counter_test.c')
-rw-r--r-- | src/plugins/unittest/counter_test.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/plugins/unittest/counter_test.c b/src/plugins/unittest/counter_test.c index e7090f0a860..65c03fe89f1 100644 --- a/src/plugins/unittest/counter_test.c +++ b/src/plugins/unittest/counter_test.c @@ -42,27 +42,6 @@ get_stats_epoch () return sm->shared_header->epoch; } -/* - * Return the maximum element count of the vector based on its allocated - * memory. - */ -static int -get_vec_mem_size (void *v, uword data_size) -{ - vlib_stats_segment_t *sm = vlib_stats_get_segment (); - - if (v == 0) - return 0; - - uword aligned_header_bytes = vec_header_bytes (0); - void *p = v - aligned_header_bytes; - void *oldheap = clib_mem_set_heap (sm->heap); - int mem_size = (clib_mem_size (p) - aligned_header_bytes) / data_size; - clib_mem_set_heap (oldheap); - - return mem_size; -} - /* number of times to repeat the counter expand tests */ #define EXPAND_TEST_ROUNDS 3 @@ -90,8 +69,7 @@ test_simple_counter_expand (vlib_main_t *vm) // Check how many elements fit into the counter vector without expanding // that. The next validate calls should not increase the stats segment // epoch. - int mem_size = get_vec_mem_size (counter.counters[0], - sizeof ((counter.counters[0])[0])); + int mem_size = vec_max_len (counter.counters[0]); for (index = 1; index <= mem_size - 1; index++) { vlib_validate_simple_counter (&counter, index); @@ -138,8 +116,7 @@ test_combined_counter_expand (vlib_main_t *vm) // Check how many elements fit into the counter vector without expanding // that. The next validate calls should not increase the stats segment // epoch. - int mem_size = get_vec_mem_size (counter.counters[0], - sizeof ((counter.counters[0])[0])); + int mem_size = vec_max_len (counter.counters[0]); for (index = 1; index <= mem_size - 1; index++) { vlib_validate_combined_counter (&counter, index); |