vppinfra: fix sparse_vec_index() returning non-zero index for some nonexistent elements

If we are testing for an index whose membership bitmask happens to sit in LSB of uword,
and there is nothing else set in that uword in the member bitmask, the shortcut path
returning the valid index is taken even if the element with a given index doesn't
exist in the sparse vector. This happens because the count of leading zeroes on the
value of 0 is zero, which is equal to the value taken modulo bitsize uword.

Take care of that case.

Also add unittests showing the problem and verifying that sparse_vec_index2 does not
have the same issue.

Change-Id: I19117e13817c3e5de579b9250bb741de42491985
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
This commit is contained in:
Andrew Yourtchenko
2019-03-28 20:36:56 +01:00
committed by Damjan Marion
parent a4b10e5e86
commit d1a12ef820
4 changed files with 112 additions and 0 deletions

34
test/test_sparse_vec.py Normal file
View File

@ -0,0 +1,34 @@
#!/usr/bin/env python
import unittest
from framework import VppTestCase, VppTestRunner
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
class TestSparseVec(VppTestCase):
""" SparseVec Test Cases """
@classmethod
def setUpClass(cls):
super(TestSparseVec, cls).setUpClass()
@classmethod
def tearDownClass(cls):
super(TestSparseVec, cls).tearDownClass()
def setUp(self):
super(TestSparseVec, self).setUp()
def tearDown(self):
super(TestSparseVec, self).tearDown()
def test_string_unittest(self):
""" SparseVec unit tests """
error = self.vapi.cli("test sparse_vec")
if error.find("failed") != -1:
self.logger.critical("FAILURE in the sparse_vec test")
self.assertNotIn("failed", error)
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)