mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix bitfield bit removal, add more asserts, extend unit test

This commit is contained in:
Mike Gelfand 2015-12-27 16:34:47 +00:00
parent e3c5ab74ed
commit d0e157eceb
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libtransmission/bitfield-test.c
View File

@ -78,7 +78,15 @@ test_bitfields (void)
for (i=0; i<bitcount; i++)
check (tr_bitfieldHas (&field, i));
/* test tr_bitfieldRem */
for (i=0; i<bitcount; i++)
if ((i % 7) != 0)
tr_bitfieldRem (&field, i);
for (i=0; i<bitcount; i++)
check (tr_bitfieldHas (&field, i) == (! (i % 7)));
/* test tr_bitfieldRemRange in the middle of a boundary */
tr_bitfieldAddRange (&field, 0, 64);
tr_bitfieldRemRange (&field, 4, 21);
for (i=0; i<64; i++)
check (tr_bitfieldHas (&field, i) == ((i < 4) || (i >= 21)));

22
libtransmission/bitfield.c
View File

@ -254,6 +254,8 @@ tr_bitfieldFreeArray (tr_bitfield * b)
static void
tr_bitfieldSetTrueCount (tr_bitfield * b, size_t n)
{
assert (n <= b->bit_count);
b->true_count = n;
if (tr_bitfieldHasAll (b) || tr_bitfieldHasNone (b))
@ -269,11 +271,23 @@ tr_bitfieldRebuildTrueCount (tr_bitfield * b)
}
static void
tr_bitfieldIncTrueCount (tr_bitfield * b, int i)
tr_bitfieldIncTrueCount (tr_bitfield * b, size_t i)
{
assert (i <= b->bit_count);
assert (b->true_count <= b->bit_count - i);
tr_bitfieldSetTrueCount (b, b->true_count + i);
}
static void
tr_bitfieldDecTrueCount (tr_bitfield * b, size_t i)
{
assert (i <= b->bit_count);
assert (b->true_count >= i);
tr_bitfieldSetTrueCount (b, b->true_count - i);
}
/****
*****
****/
@ -423,10 +437,10 @@ tr_bitfieldRem (tr_bitfield * b, size_t nth)
{
assert (tr_bitfieldIsValid (b));
if (!tr_bitfieldHas (b, nth) && tr_bitfieldEnsureNthBitAlloced (b, nth))
if (tr_bitfieldHas (b, nth) && tr_bitfieldEnsureNthBitAlloced (b, nth))
{
b->bits[nth >> 3u] &= (0xff7f >> (nth & 7u));
tr_bitfieldIncTrueCount (b, -1);
tr_bitfieldDecTrueCount (b, 1);
}
}
@ -466,5 +480,5 @@ tr_bitfieldRemRange (tr_bitfield * b, size_t begin, size_t end)
memset (b->bits + sb, 0, eb - sb);
}
tr_bitfieldIncTrueCount (b, -diff);
tr_bitfieldDecTrueCount (b, diff);
}