mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-05 08:31:53 +00:00
Code Releases Activity

Redblack test fixed to use uint as it was the original intent.

Browse Source
This commit is contained in:
Jan Maria Matejka 2018-12-12 13:02:11 +01:00
parent 4ff9aeb786
commit e3e425303a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/redblack_test.c
View File

@ -15,11 +15,11 @@
struct rb_test { struct rb_test {
REDBLACK_NODE(struct rb_test, rb_); REDBLACK_NODE(struct rb_test, rb_);
int value; uint value;
}; };
#define RBT_KEY(a) ((a)->value) #define RBT_KEY(a) ((a)->value)
#define RBT_COMPARE(a, b) ((a) - (b)) #define RBT_COMPARE(a, b) ((int)(a) - (int)(b))
#define RBTDS64 " " #define RBTDS64 " "
const char *spaces = RBTDS64; const char *spaces = RBTDS64;
@ -35,7 +35,7 @@ static void rb_dump(struct rb_test *root) {
#define RB_CHECK(root, bits, total) do { \ #define RB_CHECK(root, bits, total) do { \
REDBLACK_CHECK(struct rb_test, rb_, RBT_KEY, RBT_COMPARE, root); \ REDBLACK_CHECK(struct rb_test, rb_, RBT_KEY, RBT_COMPARE, root); \
int tot = 0; \ uint tot = 0; \
for ( \ for ( \
struct rb_test *last = NULL, *node = REDBLACK_FIRST(struct rb_test, rb_, root); \ struct rb_test *last = NULL, *node = REDBLACK_FIRST(struct rb_test, rb_, root); \
node; \ node; \
@ -47,8 +47,8 @@ static void rb_dump(struct rb_test *root) {
ASSERT(RBT_COMPARE(RBT_KEY(last), RBT_KEY(node)) < 0); \ ASSERT(RBT_COMPARE(RBT_KEY(last), RBT_KEY(node)) < 0); \
} \ } \
ASSERT(tot == total); \ ASSERT(tot == total); \
int begin = bt_random() % N, end = bt_random() % N; \ uint begin = (uint) bt_random() % N, end = (uint) bt_random() % N; \
if (begin > end) { int t = begin; begin = end; end = t; } \ if (begin > end) { uint t = begin; begin = end; end = t; } \
bt_debug("Nodes from %d to %d:\n", begin, end); \ bt_debug("Nodes from %d to %d:\n", begin, end); \
for ( \ for ( \
struct rb_test *node = REDBLACK_FIND_UP(struct rb_test, rb_, RBT_KEY, RBT_COMPARE, root, begin); \ struct rb_test *node = REDBLACK_FIND_UP(struct rb_test, rb_, RBT_KEY, RBT_COMPARE, root, begin); \
@ -87,14 +87,14 @@ rb_insert(void)
#define BIT(x) ((bits[(x) / 64] >> ((x) % 64)) & 1) #define BIT(x) ((bits[(x) / 64] >> ((x) % 64)) & 1)
#define SIT(x) (bits[(x) / 64] |= (1ULL << ((x) % 64))) #define SIT(x) (bits[(x) / 64] |= (1ULL << ((x) % 64)))
#define CIT(x) (bits[(x) / 64] &= ~(1ULL << ((x) % 64))) #define CIT(x) (bits[(x) / 64] &= ~(1ULL << ((x) % 64)))
int total = 0; uint total = 0;
u64 bits[N / 64] = {}; u64 bits[N / 64] = {};
for (int i=0; i<N * MUL; i++) { for (uint i=0; i<N * MUL; i++) {
RB_CHECK(root, bits, total); RB_CHECK(root, bits, total);
if (bt_verbose >= BT_VERBOSE_ABSOLUTELY_ALL) if (bt_verbose >= BT_VERBOSE_ABSOLUTELY_ALL)
rb_dump(root); rb_dump(root);
int tv = bt_random() % N; uint tv = (uint) bt_random() % N;
RB_FIND(root, tv, BIT(tv)); RB_FIND(root, tv, BIT(tv));
if (BIT(tv)) { if (BIT(tv)) {