Do not delete trie after finishing aggregation

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index 35675b1ab022e34bd86f8aba12da88e24190025d..4f3dba294048a7640a77eb9f94b424930c2cc87a 100644 (file)
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -1077,16 +1077,6 @@ run_aggregation(struct aggregator_proto *p)
   log("---- AGGREGATION DONE ----");
 }
 
-static void
-flush_aggregator(struct aggregator_proto *p)
-{
-  lp_flush(p->bucket_pool);
-  lp_flush(p->route_pool);
-  lp_flush(p->trie_pool);
-
-  memset(p->bucket_list, 0, sizeof(p->bucket_list[0]) * p->bucket_list_size);
-}
-
 static void trie_init(struct aggregator_proto *p);
 
 static void
@@ -1105,16 +1095,11 @@ aggregate_on_feed_end(struct channel *C)
 
   trie_init(p);
   run_aggregation(p);
-  flush_aggregator(p);
 
-  p->root = NULL;
   p->before_count = 0;
   p->after_count = 0;
   p->internal_nodes = 0;
   p->leaves = 0;
-
-  if (p->first_run)
-    p->first_run = 0;
 }
 
 /*
@@ -1752,21 +1737,6 @@ aggregator_init(struct proto_config *CF)
 static void
 trie_init(struct aggregator_proto *p)
 {
-  /*
-   * Hash tables are initialized in aggregator_start() before the first run.
-   * They are initialized here for all subsequent runs.
-   */
-  if (!p->first_run)
-  {
-    HASH_INIT(p->buckets, p->p.pool, AGGR_BUCK_ORDER);
-    HASH_INIT(p->routes, p->p.pool, AGGR_RTE_ORDER);
-
-    p->reload_buckets = (event) {
-      .hook = aggregator_reload_buckets,
-      .data = p,
-    };
-  }
-
   p->root = create_new_node(p->trie_pool);
   p->root->depth = 1;
 
@@ -1834,6 +1804,7 @@ aggregator_start(struct proto *P)
   assert(p->bucket_pool == NULL);
   assert(p->route_pool == NULL);
   assert(p->trie_pool == NULL);
+  assert(p->root == NULL);
 
   p->addr_type = p->src->table->addr_type;
 
@@ -1863,8 +1834,6 @@ aggregator_start(struct proto *P)
   hmap_init(&p->bucket_id_map, p->p.pool, 1024);
   hmap_set(&p->bucket_id_map, 0);       /* 0 is default value, do not use it as ID */
 
-  p->first_run = 1;
-
   times_update(&main_timeloop);
   log("==== FEED START ====");
 
@@ -1874,11 +1843,6 @@ aggregator_start(struct proto *P)
 static int
 aggregator_shutdown(struct proto *P)
 {
-  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
-
-  assert(p->root == NULL);
-  flush_aggregator(p);
-
   return PS_DOWN;
 }
 
@@ -1895,9 +1859,7 @@ aggregator_cleanup(struct proto *P)
   p->route_pool = NULL;
   p->trie_pool = NULL;
 
-  assert(p->root == NULL);
   p->root = NULL;
-  p->first_run = 1;
 
   p->before_count = 0;
   p->after_count = 0;

diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h
index 6f8a6d30f05b7d3a682ddddd07a7296cd6e32a72..3f204853a55c7f825a2776bac16029180a230ca3 100644 (file)
--- a/proto/aggregator/aggregator.h
+++ b/proto/aggregator/aggregator.h
@@ -75,7 +75,6 @@ struct aggregator_proto {
   event reload_buckets;
 
   /* Aggregation trie */
-  int first_run;
   uint addr_type;
   linpool *trie_pool;
   struct trie_node *root;