From: Sebastian Harl Date: Fri, 17 Jun 2011 07:25:05 +0000 (+0200) Subject: threshold: Don't register missing/write callbacks unless we have thresholds. X-Git-Tag: collectd-5.1.0~58 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e4517555fbb51d317ac4ca76dc8cfb3b8c1f5410;p=collectd.git threshold: Don't register missing/write callbacks unless we have thresholds. The checking is fairly expensive, so don't do that unless really necessary. --- diff --git a/src/threshold.c b/src/threshold.c index 88616e95..342d08ac 100644 --- a/src/threshold.c +++ b/src/threshold.c @@ -512,57 +512,6 @@ static int ut_config_host (const threshold_t *th_orig, oconfig_item_t *ci) return (status); } /* int ut_config_host */ - -int ut_config (oconfig_item_t *ci) -{ - int i; - int status = 0; - - threshold_t th; - - if (threshold_tree == NULL) - { - threshold_tree = c_avl_create ((void *) strcmp); - if (threshold_tree == NULL) - { - ERROR ("ut_config: c_avl_create failed."); - return (-1); - } - } - - memset (&th, '\0', sizeof (th)); - th.warning_min = NAN; - th.warning_max = NAN; - th.failure_min = NAN; - th.failure_max = NAN; - - th.hits = 0; - th.hysteresis = 0; - th.flags = UT_FLAG_INTERESTING; /* interesting by default */ - - for (i = 0; i < ci->children_num; i++) - { - oconfig_item_t *option = ci->children + i; - status = 0; - - if (strcasecmp ("Type", option->key) == 0) - status = ut_config_type (&th, option); - else if (strcasecmp ("Plugin", option->key) == 0) - status = ut_config_plugin (&th, option); - else if (strcasecmp ("Host", option->key) == 0) - status = ut_config_host (&th, option); - else - { - WARNING ("threshold values: Option `%s' not allowed here.", option->key); - status = -1; - } - - if (status != 0) - break; - } - - return (status); -} /* int um_config */ /* * End of the functions used to configure threshold values. */ @@ -1011,13 +960,67 @@ static int ut_missing (const value_list_t *vl, return (0); } /* }}} int ut_missing */ +int ut_config (oconfig_item_t *ci) +{ /* {{{ */ + int i; + int status = 0; + + threshold_t th; + + if (threshold_tree == NULL) + { + threshold_tree = c_avl_create ((void *) strcmp); + if (threshold_tree == NULL) + { + ERROR ("ut_config: c_avl_create failed."); + return (-1); + } + } + + memset (&th, '\0', sizeof (th)); + th.warning_min = NAN; + th.warning_max = NAN; + th.failure_min = NAN; + th.failure_max = NAN; + + th.hits = 0; + th.hysteresis = 0; + th.flags = UT_FLAG_INTERESTING; /* interesting by default */ + + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *option = ci->children + i; + status = 0; + + if (strcasecmp ("Type", option->key) == 0) + status = ut_config_type (&th, option); + else if (strcasecmp ("Plugin", option->key) == 0) + status = ut_config_plugin (&th, option); + else if (strcasecmp ("Host", option->key) == 0) + status = ut_config_host (&th, option); + else + { + WARNING ("threshold values: Option `%s' not allowed here.", option->key); + status = -1; + } + + if (status != 0) + break; + } + + if (c_avl_size (threshold_tree) > 0) { + plugin_register_missing ("threshold", ut_missing, + /* user data = */ NULL); + plugin_register_write ("threshold", ut_check_threshold, + /* user data = */ NULL); + } + + return (status); +} /* }}} int um_config */ + void module_register (void) { plugin_register_complex_config ("threshold", ut_config); - plugin_register_missing ("threshold", ut_missing, - /* user data = */ NULL); - plugin_register_write ("threshold", ut_check_threshold, - /* user data = */ NULL); } /* vim: set sw=2 ts=8 sts=2 tw=78 et fdm=marker : */