Add logs and declarations, remove unused code

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index 43ee9482d56919328377d34ddb972271c586dc9d..5b4775c926313e56146f060c15c81cb4de26ca70 100644 (file)
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -882,7 +882,6 @@ collect_prefixes(struct aggregator_proto *p)
   else
     bug("Invalid NET type");
 
-  log("%d prefixes after aggregation", count);
   p->after_count = count;
 }
 
@@ -954,6 +953,9 @@ run_aggregation(struct channel *C)
   construct_trie(p);
   calculate_trie(p);
   collect_prefixes(p);
+
+  log("%d prefixes before aggregation", p->before_count);
+  log("%d prefixes after aggregation", p->after_count);
   log("==== AGGREGATION DONE ====");
 }
 

diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h
index b28008a99662e3bd4b599c7fe576aec842c1632c..cf5b605c196eac9787aea6eb1fc13e4c129bfb0c 100644 (file)
--- a/proto/aggregator/aggregator.h
+++ b/proto/aggregator/aggregator.h
@@ -70,7 +70,8 @@ struct aggregator_proto {
   uint addr_type;
   slab *trie_slab;
   struct trie_node *root;
-  struct event reload_trie;
+  int before_count;
+  int after_count;
 };
 
 enum aggr_item_type {
@@ -102,9 +103,4 @@ struct trie_node {
   int depth;
 };
 
-struct prefix_bucket {
-  net_addr_ip4 trie_prefix;
-  struct aggregator_bucket *bucket;
-};
-
 #endif