mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-21 22:07:03 +00:00
Code Releases Activity

Add unique ID to buckets and compare them by this ID

Browse Source
This commit is contained in:
Igor Putovny 2024-07-10 13:09:48 +02:00
parent e23d296a14
commit ebe86a83b6
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
proto/aggregator/aggregator.c
View File

@ -170,6 +170,34 @@ get_ancestor_bucket(const struct trie_node *node)
} }
} }
/*
* Assign unique ID to all buckets to enable sorting
*/
static void
assign_bucket_id(struct trie_node *node, u32 *counter)
{
assert(node != NULL);
if (node->bucket)
{
if (node->bucket->id == 0)
{
node->bucket->id = *counter;
*counter += 1;
}
/* All leaves have a bucket */
if (is_leaf(node))
return;
}
if (node->child[0])
assign_bucket_id(node->child[0], counter);
if (node->child[1])
assign_bucket_id(node->child[1], counter);
}
/* /*
* First pass of Optimal Route Table Construction (ORTC) algorithm * First pass of Optimal Route Table Construction (ORTC) algorithm
*/ */
@ -254,10 +282,10 @@ aggregator_bucket_compare(const struct aggregator_bucket *a, const struct aggreg
assert(a != NULL); assert(a != NULL);
assert(b != NULL); assert(b != NULL);
if ((uintptr_t)a < (uintptr_t)b) if (a->id < b->id)
return -1; return -1;
if ((uintptr_t)a > (uintptr_t)b) if (a->id > b->id)
return 1; return 1;
return 0; return 0;
@ -307,11 +335,11 @@ compute_buckets_union(struct trie_node *node, const struct trie_node *left, cons
output_buckets[output_count++] = input_buckets[i]; output_buckets[output_count++] = input_buckets[i];
} }
// strictly greater /* Strictly greater */
for (int i = 1; i < output_count; i++) for (int i = 1; i < output_count; i++)
assert(output_buckets[i - 1] < output_buckets[i]); assert(output_buckets[i - 1]->id < output_buckets[i]->id);
// duplicates /* Duplicates */
for (int i = 0; i < output_count; i++) for (int i = 0; i < output_count; i++)
for (int j = i + 1; j < output_count; j++) for (int j = i + 1; j < output_count; j++)
assert(output_buckets[i] != output_buckets[j]); assert(output_buckets[i] != output_buckets[j]);
@ -363,11 +391,11 @@ compute_buckets_intersection(struct trie_node *node, const struct trie_node *lef
bug("Impossible"); bug("Impossible");
} }
// strictly greater /* Strictly greater */
for (int k = 1; k < output_count; k++) for (int k = 1; k < output_count; k++)
assert(output[k - 1] < output[k]); assert(output[k - 1]->id < output[k]->id);
// duplicates /* Duplicates */
for (int k = 0; k < output_count; k++) for (int k = 0; k < output_count; k++)
for (int l = k + 1; l < output_count; l++) for (int l = k + 1; l < output_count; l++)
assert(output[k] != output[l]); assert(output[k] != output[l]);
@ -441,7 +469,7 @@ second_pass(struct trie_node *node)
second_pass(left); second_pass(left);
second_pass(right); second_pass(right);
// duplicates /* Duplicates */
for (int i = 0; i < left->potential_buckets_count; i++) for (int i = 0; i < left->potential_buckets_count; i++)
for (int j = i + 1; j < left->potential_buckets_count; j++) for (int j = i + 1; j < left->potential_buckets_count; j++)
assert(left->potential_buckets[i] != left->potential_buckets[j]); assert(left->potential_buckets[i] != left->potential_buckets[j]);
@ -502,7 +530,7 @@ third_pass(struct trie_node *node)
} }
else else
{ {
// Internal nodes should not have a bucket since it was deleted during first pass /* Internal nodes should not have a bucket since it was deleted during first pass */
if (!is_leaf(node)) if (!is_leaf(node))
assert(node->bucket == NULL); assert(node->bucket == NULL);
@ -840,6 +868,10 @@ calculate_trie(struct aggregator_proto *p)
log("====PREFIXES BEFORE ===="); log("====PREFIXES BEFORE ====");
/* Start with 1 as 0 is reserved for IDs that have not been assigned yet */
u32 bucket_counter = 1;
assign_bucket_id(p->root, &bucket_counter);
log("====FIRST PASS===="); log("====FIRST PASS====");
first_pass(p->root, p->trie_pool); first_pass(p->root, p->trie_pool);
first_pass_after_check(p->root); first_pass_after_check(p->root);

1
proto/aggregator/aggregator.h
View File

@ -47,6 +47,7 @@ struct aggregator_bucket {
struct rte_src *last_src; /* Which src we announced the bucket last with */ struct rte_src *last_src; /* Which src we announced the bucket last with */
u32 count; u32 count;
u32 hash; u32 hash;
u32 id;
struct f_val aggr_data[0]; struct f_val aggr_data[0];
}; };