Rename

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index c42b4e7fbc3b89b4c4b426be31b8027658b7df08..dc814e0e6586b0f4daac1c9d8944f2c9a80f34de 100644 (file)
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -708,7 +708,7 @@ aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new
   {
     if (p->root)
     {
-      aggregator_recalculate(p, old_route, new_route);
+      aggregator_recompute(p, old_route, new_route);
 
       /* Process route withdrawals triggered by recalculation */
       aggregator_withdraw_rte(p);

diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h
index 5e58526bb359d2ea6be07cb845300111416b37ba..e6f1e134b2651cf76ca62c60ae48890e3f4b837a 100644 (file)
--- a/proto/aggregator/aggregator.h
+++ b/proto/aggregator/aggregator.h
@@ -148,7 +148,7 @@ struct trie_node {
 };
 
 void aggregator_aggregate(struct aggregator_proto *p);
-void aggregator_recalculate(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new);
+void aggregator_recompute(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new);
 void aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *bucket, struct network *net);
 
 struct trie_node *aggregator_create_new_node(struct slab *trie_slab);

diff --git a/proto/aggregator/trie.c b/proto/aggregator/trie.c
index bd667d150ae3c74d77aa92bbe138188d674af66e..877b5e6452b50b3f6b871d858d9606a60e2ee238 100644 (file)
--- a/proto/aggregator/trie.c
+++ b/proto/aggregator/trie.c
@@ -921,7 +921,7 @@ aggregator_construct_trie(struct aggregator_proto *p)
  * Run Optimal Routing Table Constructor (ORTC) algorithm
  */
 static void
-aggregator_calculate_trie(struct aggregator_proto *p)
+aggregator_compute_trie(struct aggregator_proto *p)
 {
   ASSERT_DIE(p->addr_type == NET_IP4 || p->addr_type == NET_IP6);
 
@@ -937,14 +937,14 @@ aggregator_aggregate(struct aggregator_proto *p)
   ASSERT_DIE(p->root != NULL);
 
   aggregator_construct_trie(p);
-  aggregator_calculate_trie(p);
+  aggregator_compute_trie(p);
 }
 
 /*
  * Incorporate prefix change into the trie and reaggregate
  */
 void
-aggregator_recalculate(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new)
+aggregator_recompute(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new)
 {
   struct trie_node *updated_node = NULL;