From: Igor Putovny Date: Thu, 13 Feb 2025 17:28:12 +0000 (+0100) Subject: Cleanup X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac223f25267787003001988a6b5fb399bcbfa13d;p=thirdparty%2Fbird.git Cleanup --- diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c index c60bad2a6..b957cbb67 100644 --- a/proto/aggregator/aggregator.c +++ b/proto/aggregator/aggregator.c @@ -1232,28 +1232,8 @@ run_aggregation(struct aggregator_proto *p) { assert(p->root != NULL); - times_update(&main_timeloop); - - log("---- AGGREGATION START ----"); - - times_update(&main_timeloop); - log("==== BUILDING TRIE ===="); construct_trie(p); - times_update(&main_timeloop); - log("==== BUILDING TRIE DONE ===="); - calculate_trie(p); - - times_update(&main_timeloop); - log("==== COLLECTING PREFIXES ===="); - times_update(&main_timeloop); - log("==== COLLECTING PREFIXES DONE ===="); - - times_update(&main_timeloop); - - log("%d prefixes before aggregation", p->before_count); - log("%d prefixes after aggregation", p->after_count); - log("---- AGGREGATION DONE ----"); } static void trie_init(struct aggregator_proto *p); @@ -1274,9 +1254,6 @@ aggregate_on_feed_end(struct channel *C) trie_init(p); run_aggregation(p); - - p->before_count = 0; - p->after_count = 0; } /* @@ -2082,9 +2059,6 @@ aggregator_cleanup(struct proto *P) p->root = NULL; - p->before_count = 0; - p->after_count = 0; - p->bucket_list = NULL; p->bucket_list_size = 0; p->bucket_list_count = 0; diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h index 45dab2983..69a0eb1bd 100644 --- a/proto/aggregator/aggregator.h +++ b/proto/aggregator/aggregator.h @@ -87,8 +87,6 @@ struct aggregator_proto { uint addr_type; linpool *trie_pool; struct trie_node *root; - int before_count; - int after_count; int logging; /* List of bucket pointers */