osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
14
0
Fork 1
Code Issues Releases Wiki Activity

bitvec: Add bitvec_bytes_used() function 

This new bitvec API function returns the number of bytes used in a given
bit-vector.

Change-Id: Id4bd7f7543f5b0f4f6f876e283bd065039c37646
This commit is contained in:
Harald Welte 2019-02-03 12:04:46 +01:00
parent 71806ddb29
commit ae7966d145
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/osmocom/core/bitvec.h
View File

@ -84,4 +84,13 @@ unsigned int bitvec_add_array(struct bitvec *bv, const uint32_t *array,
unsigned int array_len, bool dry_run,
unsigned int num_bits);
/*! Return the number of bytes used within the bit vector */
static inline unsigned int bitvec_used_bytes(const struct bitvec *bv)
{
unsigned int bytes = bv->cur_bit/8;
if (bv->cur_bit%8)
bytes++;
return bytes;
}
/*! @} */

26
tests/bitvec/bitvec_test.c
View File

@ -181,6 +181,29 @@ static void test_array()
test_array_item(17, &b, n, array, n * 3);
}
static void test_used_bytes()
{
struct bitvec b;
uint8_t d[32];
unsigned int i;
b.data = d;
b.data_len = sizeof(d);
bitvec_zero(&b);
OSMO_ASSERT(bitvec_used_bytes(&b) == 0);
for (i = 0; i < 8; i++) {
bitvec_set_bit(&b, 1);
OSMO_ASSERT(bitvec_used_bytes(&b) == 1);
}
for (i = 8; i < 16; i++) {
bitvec_set_bit(&b, 1);
OSMO_ASSERT(bitvec_used_bytes(&b) == 2);
}
}
int main(int argc, char **argv)
{
struct bitvec bv;
@ -286,6 +309,9 @@ int main(int argc, char **argv)
bitvec_zero(&bv);
test_bitvec_rl_curbit(&bv, 1, 64, 0);
printf("\nbitvec bytes used.\n");
test_used_bytes();
printf("\nbitvec ok.\n");
return 0;
}

2
tests/bitvec/bitvec_test.ok
View File

@ -168,4 +168,6 @@ bits: 17, est: 1153, real: 1153, x: 0, y: 0
........ ........ ........ ........ ........ ........ ........ ........ ........ ........ ........ ........
bitvec_runlength....
bitvec bytes used.
bitvec ok.