mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00
Code Releases Activity

Fix aggregator_bucket_intersect(), add comments and fix naming

Browse Source
This commit is contained in:
Igor Putovny 2023-09-19 12:06:52 +02:00
parent ead1ade4c2
commit 144e6c393c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
proto/aggregator/aggregator.c
View File

@ -222,8 +222,11 @@ aggregator_bucket_compare(const void *a, const void *b)
return 0; return 0;
} }
/*
* Compute intersection of two sets of potential buckets in @left and @right and put result in @node
*/
static void static void
aggregator_bucket_intersection(struct trie_node *node, const struct trie_node *left, const struct trie_node *right) aggregator_bucket_intersect(struct trie_node *node, const struct trie_node *left, const struct trie_node *right)
{ {
assert(node != NULL); assert(node != NULL);
assert(left != NULL); assert(left != NULL);
@ -246,14 +249,17 @@ aggregator_bucket_intersection(struct trie_node *node, const struct trie_node *l
j++; j++;
} }
else if (res == -1) else if (res == -1)
node->potential_buckets[node->potential_buckets_count++] = left->potential_buckets[i++]; i++;
else if (res == 1) else if (res == 1)
node->potential_buckets[node->potential_buckets_count++] = right->potential_buckets[j++]; j++;
} }
} }
/*
* Compute union of two sets of potential buckets in @left and @right and put result in @node
*/
static void static void
aggregator_bucket_union(struct trie_node *node, const struct trie_node *left, const struct trie_node *right) aggregator_bucket_unionize(struct trie_node *node, const struct trie_node *left, const struct trie_node *right)
{ {
assert(node != NULL); assert(node != NULL);
assert(left != NULL); assert(left != NULL);
@ -353,9 +359,9 @@ second_pass(struct trie_node *node)
qsort(right->potential_buckets, right->potential_buckets_count, sizeof(struct aggregator_bucket *), aggregator_bucket_compare); qsort(right->potential_buckets, right->potential_buckets_count, sizeof(struct aggregator_bucket *), aggregator_bucket_compare);
if (bucket_sets_are_disjoint(left, right)) if (bucket_sets_are_disjoint(left, right))
aggregator_bucket_union(node, left, right); aggregator_bucket_unionize(node, left, right);
else else
aggregator_bucket_intersection(node, left, right); aggregator_bucket_intersect(node, left, right);
log("node: %p, potential buckets count: %d", node, node->potential_buckets_count); log("node: %p, potential buckets count: %d", node, node->potential_buckets_count);