From 371eb49043d225d2bab8149187b813a14b4b86d2 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Wed, 9 Nov 2022 21:09:16 +0100 Subject: Conf: Free stored old config before parsing new one BIRD keeps a previous (old) configuration for the purpose of undo. The existing code frees it after a new configuration is successfully parsed during reconfiguration. That causes memory usage spikes as there are temporarily three configurations (old, current, and new). The patch changes it to free the old one before parsing the new one (as user already requested a new config). The disadvantage is that undo is not available after failed reconfiguration. --- conf/conf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'conf/conf.c') diff --git a/conf/conf.c b/conf/conf.c index 11c136e7..4e31de29 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -201,6 +201,23 @@ config_free(struct config *c) rfree(c->pool); } +/** + * config_free_old - free stored old configuration + * + * This function frees the old configuration (%old_config) that is saved for the + * purpose of undo. It is useful before parsing a new config when reconfig is + * requested, to avoid keeping three (perhaps memory-heavy) configs together. + */ +void +config_free_old(void) +{ + tm_stop(config_timer); + undo_available = 0; + + config_free(old_config); + old_config = NULL; +} + void config_add_obstacle(struct config *c) { -- cgit v1.2.3