From: <ag...@us...> - 2012-09-10 16:28:06
|
Revision: 2175 http://nagios.svn.sourceforge.net/nagios/?rev=2175&view=rev Author: ageric Date: 2012-09-10 16:27:55 +0000 (Mon, 10 Sep 2012) Log Message: ----------- xdata/xodtemplate: Throw away templates when we're done with them After objects have been resolved, we really don't need the templates anymore, so we might as well get rid of them completely. This patch does just that, letting us reuse what memory they've taken up later in the config parsing. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/xdata/xodtemplate.c Modified: nagioscore/trunk/xdata/xodtemplate.c =================================================================== --- nagioscore/trunk/xdata/xodtemplate.c 2012-09-10 16:27:38 UTC (rev 2174) +++ nagioscore/trunk/xdata/xodtemplate.c 2012-09-10 16:27:55 UTC (rev 2175) @@ -138,6 +138,14 @@ /************* TOP-LEVEL CONFIG DATA INPUT FUNCTION ***************/ /******************************************************************/ +static void xodtemplate_free_template_skiplists(void) { + int x = 0; + + for(x = 0; x < NUM_XOBJECT_SKIPLISTS; x++) { + skiplist_free(&xobject_template_skiplists[x]); + } + } + /* process all config files - both core and CGIs pass in name of main config file */ int xodtemplate_read_config_data(char *main_config_file, int options) { #ifdef NSCORE @@ -325,6 +333,10 @@ /* resolve objects definitions */ if(result == OK) result = xodtemplate_resolve_objects(); + + /* these are no longer needed */ + xodtemplate_free_template_skiplists(); + if(test_scheduling == TRUE) gettimeofday(&tv[2], NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |