From 37b445468e45b537621269fc1e375f26ca2100ee Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 27 Apr 2020 18:38:36 -0400 Subject: vppinfra: improve test coverage Bonus corner-case bugfix in bitmap.h, found during the exercise. Issue dates from 2001 or thereabouts. Please review this specific change carefully. lcov_post: filter system include directories and generated files in build-root Type: improvement Signed-off-by: Dave Barach Change-Id: Iaa0b63e9dc571dfe3d992197ac49ba4d93403c61 --- src/plugins/unittest/CMakeLists.txt | 1 + src/plugins/unittest/bitmap_test.c | 76 +++++++++++++++++++++++++++++++++++++ src/vppinfra/bitmap.h | 2 +- 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/plugins/unittest/bitmap_test.c (limited to 'src') diff --git a/src/plugins/unittest/CMakeLists.txt b/src/plugins/unittest/CMakeLists.txt index e75b96ff265..7ab63dad6a4 100644 --- a/src/plugins/unittest/CMakeLists.txt +++ b/src/plugins/unittest/CMakeLists.txt @@ -15,6 +15,7 @@ add_vpp_plugin(unittest SOURCES bier_test.c bihash_test.c + bitmap_test.c crypto/aes_cbc.c crypto/aes_ctr.c crypto/aes_gcm.c diff --git a/src/plugins/unittest/bitmap_test.c b/src/plugins/unittest/bitmap_test.c new file mode 100644 index 00000000000..04a06d39a18 --- /dev/null +++ b/src/plugins/unittest/bitmap_test.c @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2020 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include + +static clib_error_t * +test_bitmap_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + u64 *bm = 0; + u64 *bm2 = 0; + u64 *dup; + uword junk; + + bm = clib_bitmap_set_multiple (bm, 2, ~0ULL, BITS (uword)); + + junk = clib_bitmap_next_clear (bm, 3); + junk = clib_bitmap_next_clear (bm, 65); + + bm2 = clib_bitmap_set_multiple (bm2, 0, ~0ULL, BITS (uword)); + _vec_len (bm2) = 1; + junk = clib_bitmap_next_clear (bm2, 0); + + + bm = clib_bitmap_set_multiple (bm, 2, ~0ULL, BITS (uword) - 3); + junk = clib_bitmap_get_multiple (bm, 2, BITS (uword)); + junk = clib_bitmap_first_set (bm); + junk = 1 << 3; + bm = clib_bitmap_xori (bm, junk); + bm = clib_bitmap_andi (bm, junk); + bm = clib_bitmap_xori_notrim (bm, junk); + bm = clib_bitmap_andi_notrim (bm, junk); + + bm = clib_bitmap_set_multiple (bm, 2, ~0ULL, BITS (uword) - 3); + bm2 = clib_bitmap_set_multiple (bm2, 2, ~0ULL, BITS (uword) - 3); + + dup = clib_bitmap_dup_and (bm, bm2); + vec_free (dup); + dup = clib_bitmap_dup_andnot (bm, bm2); + vec_free (dup); + vec_free (bm); + vec_free (bm2); + + return 0; +} + + + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (test_bihash_command, static) = +{ + .path = "test bitmap", + .short_help = "Coverage test for bitmap.h", + .function = test_bitmap_command_fn, +}; +/* *INDENT-ON* */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vppinfra/bitmap.h b/src/vppinfra/bitmap.h index e6b59d81cca..44411163975 100644 --- a/src/vppinfra/bitmap.h +++ b/src/vppinfra/bitmap.h @@ -730,7 +730,7 @@ clib_bitmap_next_clear (uword * ai, uword i) } /* no clear bit left in bitmap, return bit just beyond bitmap */ - return (i0 + 1) * BITS (ai[0]); + return (i0 * BITS (ai[0])) + 1; } return i; } -- cgit 1.2.3-korg