diff options
Diffstat (limited to 'src/vppinfra/test_vec.c')
| -rw-r--r-- | src/vppinfra/test_vec.c | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/src/vppinfra/test_vec.c b/src/vppinfra/test_vec.c index c6f97fb984d..9f336a0a095 100644 --- a/src/vppinfra/test_vec.c +++ b/src/vppinfra/test_vec.c @@ -207,33 +207,35 @@ dump_call_stats (uword * stats) more sensible value later. */ #define MAX_VEC_LEN 10 -#define create_random_vec_wh(elt_type, len, hdr_bytes, seed) \ -({ \ - elt_type * _v(v) = NULL; \ - uword _v(l) = (len); \ - uword _v(h) = (hdr_bytes); \ - u8 * _v(hdr); \ - \ - if (_v(l) == 0) \ - goto __done__; \ - \ - /* ~0 means select random length between 0 and MAX_VEC_LEN. */ \ - if (_v(l) == ~0) \ - _v(l) = bounded_random_u32 (&(seed), 0, MAX_VEC_LEN); \ - \ - _v(v) = _vec_resize (NULL, _v(l), _v(l) * sizeof (elt_type), _v(h), 0); \ - fill_with_random_data (_v(v), vec_bytes (_v(v)), (seed)); \ - \ - /* Fill header with random data as well. */ \ - if (_v(h) > 0) \ - { \ - _v(hdr) = vec_header (_v(v), _v(h)); \ - fill_with_random_data (_v(hdr), _v(h), (seed)); \ - } \ - \ -__done__: \ - _v(v); \ -}) +#define create_random_vec_wh(elt_type, len, hdr_bytes, seed) \ + ({ \ + elt_type *_v (v) = NULL; \ + uword _v (l) = (len); \ + vec_attr_t _v (attr) = { .hdr_sz = (hdr_bytes), \ + .elt_sz = sizeof (elt_type) }; \ + uword _v (h) = (hdr_bytes); \ + u8 *_v (hdr); \ + \ + if (_v (l) == 0) \ + goto __done__; \ + \ + /* ~0 means select random length between 0 and MAX_VEC_LEN. */ \ + if (_v (l) == ~0) \ + _v (l) = bounded_random_u32 (&(seed), 0, MAX_VEC_LEN); \ + \ + _v (v) = _vec_alloc_internal (_v (l), &_v (attr)); \ + fill_with_random_data (_v (v), vec_bytes (_v (v)), (seed)); \ + \ + /* Fill header with random data as well. */ \ + if (_v (h) > 0) \ + { \ + _v (hdr) = vec_header (_v (v)); \ + fill_with_random_data (_v (hdr), _v (h), (seed)); \ + } \ + \ + __done__: \ + _v (v); \ + }) #define create_random_vec(elt_type, len, seed) \ create_random_vec_wh (elt_type, len, 0, seed) @@ -258,7 +260,7 @@ validate_vec_free (elt_t * vec) static elt_t * validate_vec_free_h (elt_t * vec, uword hdr_bytes) { - vec_free_h (vec, hdr_bytes); + vec_free (vec); ASSERT (vec == NULL); return vec; } @@ -274,8 +276,8 @@ validate_vec_hdr (elt_t * vec, uword hdr_bytes) return; vh = _vec_find (vec); - hdr = vec_header (vec, hdr_bytes); - hdr_end = vec_header_end (hdr, hdr_bytes); + hdr = vec_header (vec); + hdr_end = vec_header_end (hdr); ASSERT (hdr_end == (u8 *) vec); ASSERT ((u8 *) vh - (u8 *) hdr >= hdr_bytes); @@ -335,8 +337,7 @@ validate_vec (elt_t * vec, uword hdr_bytes) else { if (hdr_bytes > 0) - VERBOSE3 ("Header: %U\n", - format_hex_bytes, vec_header (vec, sizeof (vec[0])), + VERBOSE3 ("Header: %U\n", format_hex_bytes, vec_header (vec), sizeof (vec[0])); VERBOSE3 ("%U\n\n", @@ -371,7 +372,7 @@ validate_vec_resize_h (elt_t * vec, uword num_elts, uword hdr_bytes) len1 = vec_len (vec); if (vec) - hdr = vec_header (vec, hdr_bytes); + hdr = vec_header (vec); hash = compute_vec_hash (0, vec); hdr_hash = compute_mem_hash (0, hdr, hdr_bytes); @@ -391,7 +392,7 @@ validate_vec_resize_h (elt_t * vec, uword num_elts, uword hdr_bytes) } if (vec) - hdr = vec_header (vec, hdr_bytes); + hdr = vec_header (vec); ASSERT (compute_vec_hash (hash, vec) == 0); ASSERT (compute_mem_hash (hdr_hash, hdr, hdr_bytes) == 0); @@ -677,7 +678,7 @@ validate_vec_init_h (uword num_elts, uword hdr_bytes) uword len; elt_t *new; - new = vec_new_ha (elt_t, num_elts, hdr_bytes, 0); + new = vec_new_generic (elt_t, num_elts, hdr_bytes, 0, 0); len = vec_len (new); ASSERT (len == num_elts); @@ -687,7 +688,7 @@ validate_vec_init_h (uword num_elts, uword hdr_bytes) { if (i == 0) { - ptr = (u8 *) vec_header (new, hdr_bytes); + ptr = (u8 *) vec_header (new); end = ptr + hdr_bytes; } else @@ -799,7 +800,7 @@ run_validator_wh (uword iter) { case OP_IS_VEC_INIT_H: num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE); - vec_free_h (vec, sizeof (hdr_t)); + vec_free (vec); VERBOSE2 ("vec_init_h(), new elts %d\n", num_elts); vec = validate_vec_init_h (num_elts, sizeof (hdr_t)); break; @@ -840,7 +841,7 @@ run_validator_wh (uword iter) } validate_vec (vec, sizeof (hdr_t)); - vec_free_h (vec, sizeof (hdr_t)); + vec_free (vec); } static void |