mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Update time before and after aggregation

Browse Source
This commit is contained in:
Igor Putovny 2024-07-10 15:10:57 +02:00
parent 308454caa7
commit 3edc3b3a5b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proto/aggregator/aggregator.c
View File

@ -908,12 +908,16 @@ static void
run_aggregation(struct aggregator_proto *p) run_aggregation(struct aggregator_proto *p)
{ {
assert(p->root != NULL); assert(p->root != NULL);
log("==== AGGREGATION START ====");
times_update(&main_timeloop);
log("==== AGGREGATION START ====");
construct_trie(p); construct_trie(p);
calculate_trie(p); calculate_trie(p);
collect_prefixes(p); collect_prefixes(p);
times_update(&main_timeloop);
log("%d prefixes before aggregation", p->before_count); log("%d prefixes before aggregation", p->before_count);
log("%d prefixes after aggregation", p->after_count); log("%d prefixes after aggregation", p->after_count);
log("%d internal nodes with bucket", p->internal_nodes); log("%d internal nodes with bucket", p->internal_nodes);
@ -1366,6 +1370,7 @@ aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new
/* Evaluate route attributes. */ /* Evaluate route attributes. */
struct aggregator_bucket *tmp_bucket = lp_allocz(p->bucket_pool, sizeof(*tmp_bucket)); struct aggregator_bucket *tmp_bucket = lp_allocz(p->bucket_pool, sizeof(*tmp_bucket));
assert(tmp_bucket->id == 0);
for (uint val_idx = 0; val_idx < p->aggr_on_count; val_idx++) for (uint val_idx = 0; val_idx < p->aggr_on_count; val_idx++)
{ {
@ -1648,6 +1653,7 @@ trie_init(struct aggregator_proto *p)
/* Allocate bucket for root node */ /* Allocate bucket for root node */
struct aggregator_bucket *new_bucket = lp_allocz(p->bucket_pool, sizeof(*new_bucket)); struct aggregator_bucket *new_bucket = lp_allocz(p->bucket_pool, sizeof(*new_bucket));
assert(new_bucket->id == 0);
u64 haux = 0; u64 haux = 0;
mem_hash_init(&haux); mem_hash_init(&haux);
new_bucket->hash = mem_hash_value(&haux); new_bucket->hash = mem_hash_value(&haux);