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

Don't schedule aggregation as event but run it at the protocol feed end

Browse Source
This commit is contained in:
Igor Putovny 2024-04-11 16:53:40 +02:00
parent 470facb69b
commit ceb556e2cc
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
proto/aggregator/aggregator.c
View File

@ -882,6 +882,36 @@ collect_prefixes(struct aggregator_proto *p)
bug("Invalid NET type"); bug("Invalid NET type");
log("%d prefixes collected", count); log("%d prefixes collected", count);
p->after_count = count;
}
static void
construct_trie(struct aggregator_proto *p)
{
HASH_WALK(p->buckets, next_hash, bucket)
{
for (const struct rte *rte = bucket->rte; rte; rte = rte->next)
{
union net_addr_union *uptr = (net_addr_union *)rte->net->n.addr;
assert(uptr->n.type == NET_IP4 || uptr->n.type == NET_IP6);
if (uptr->n.type == NET_IP4)
{
const struct net_addr_ip4 *addr = &uptr->ip4;
trie_insert_prefix_ip4(addr, p->root, bucket, p->trie_slab);
log("INSERT %N", addr);
p->before_count++;
}
else if (uptr->n.type == NET_IP6)
{
const struct net_addr_ip6 *addr = &uptr->ip6;
trie_insert_prefix_ip6(addr, p->root, bucket, p->trie_slab);
log("INSERT %N", addr);
p->before_count++;
}
}
}
HASH_WALK_END;
} }
/* /*
@ -1467,9 +1497,7 @@ aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new
} }
HASH_WALK_END; HASH_WALK_END;
if (p->net_present == 0) if (p->net_present != 0)
ev_schedule(&p->reload_trie);
else
{ {
/* Announce changes */ /* Announce changes */
if (old_bucket) if (old_bucket)
@ -1546,6 +1574,7 @@ aggregator_init(struct proto_config *CF)
P->rt_notify = aggregator_rt_notify; P->rt_notify = aggregator_rt_notify;
P->preexport = aggregator_preexport; P->preexport = aggregator_preexport;
P->feed_end = calculate_trie;
return P; return P;
} }
@ -1572,11 +1601,6 @@ aggregator_start(struct proto *P)
p->root = new_node(p->trie_slab); p->root = new_node(p->trie_slab);
p->root->depth = 1; p->root->depth = 1;
p->reload_trie = (event) {
.hook = calculate_trie,
.data = p,
};
struct network *default_net = NULL; struct network *default_net = NULL;
if (p->addr_type == NET_IP4) if (p->addr_type == NET_IP4)
@ -1647,7 +1671,6 @@ aggregator_shutdown(struct proto *P)
} }
HASH_WALK_END; HASH_WALK_END;
ev_postpone(&p->reload_trie);
delete_trie(p->root); delete_trie(p->root);
p->root = NULL; p->root = NULL;