summaryrefslogtreecommitdiffstats
path: root/libnetdata/dyn_conf
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-09-04 08:57:43 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-09-04 08:57:43 +0000
commit42ad44d1fea072d23f2e0067bca4ba6bc0b2a523 (patch)
treeb1c1459c6914f1d4c5b123b601b9dbecb049360c /libnetdata/dyn_conf
parentAdding upstream version 1.42.1. (diff)
downloadnetdata-42ad44d1fea072d23f2e0067bca4ba6bc0b2a523.tar.xz
netdata-42ad44d1fea072d23f2e0067bca4ba6bc0b2a523.zip
Adding upstream version 1.42.2.upstream/1.42.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libnetdata/dyn_conf')
-rw-r--r--libnetdata/dyn_conf/dyn_conf.c64
1 files changed, 52 insertions, 12 deletions
diff --git a/libnetdata/dyn_conf/dyn_conf.c b/libnetdata/dyn_conf/dyn_conf.c
index 3e098fb7f..00289fdf5 100644
--- a/libnetdata/dyn_conf/dyn_conf.c
+++ b/libnetdata/dyn_conf/dyn_conf.c
@@ -20,10 +20,19 @@ struct deferred_cfg_send {
struct deferred_cfg_send *next;
};
+bool dyncfg_shutdown = false;
struct deferred_cfg_send *deferred_configs = NULL;
pthread_mutex_t deferred_configs_lock = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t deferred_configs_cond = PTHREAD_COND_INITIALIZER;
+static void deferred_config_free(struct deferred_cfg_send *dcs)
+{
+ freez(dcs->plugin_name);
+ freez(dcs->module_name);
+ freez(dcs->job_name);
+ freez(dcs);
+}
+
static void deferred_config_push_back(const char *plugin_name, const char *module_name, const char *job_name)
{
struct deferred_cfg_send *deferred = callocz(1, sizeof(struct deferred_cfg_send));
@@ -34,6 +43,11 @@ static void deferred_config_push_back(const char *plugin_name, const char *modul
deferred->job_name = strdupz(job_name);
}
pthread_mutex_lock(&deferred_configs_lock);
+ if (dyncfg_shutdown) {
+ pthread_mutex_unlock(&deferred_configs_lock);
+ deferred_config_free(deferred);
+ return;
+ }
struct deferred_cfg_send *last = deferred_configs;
if (last == NULL)
deferred_configs = deferred;
@@ -46,25 +60,29 @@ static void deferred_config_push_back(const char *plugin_name, const char *modul
pthread_mutex_unlock(&deferred_configs_lock);
}
-static struct deferred_cfg_send *deferred_config_pop()
+static void deferred_configs_unlock()
+{
+ dyncfg_shutdown = true;
+ // if we get cancelled in pthread_cond_wait
+ // we will arrive at cancelled cleanup handler
+ // with mutex locked we need to unlock it
+ pthread_mutex_unlock(&deferred_configs_lock);
+}
+
+static struct deferred_cfg_send *deferred_config_pop(void *ptr)
{
pthread_mutex_lock(&deferred_configs_lock);
- while (deferred_configs == NULL)
+ while (deferred_configs == NULL) {
+ netdata_thread_cleanup_push(deferred_configs_unlock, ptr);
pthread_cond_wait(&deferred_configs_cond, &deferred_configs_lock);
+ netdata_thread_cleanup_pop(0);
+ }
struct deferred_cfg_send *deferred = deferred_configs;
deferred_configs = deferred_configs->next;
pthread_mutex_unlock(&deferred_configs_lock);
return deferred;
}
-static void deferred_config_free(struct deferred_cfg_send *dcs)
-{
- freez(dcs->plugin_name);
- freez(dcs->module_name);
- freez(dcs->job_name);
- freez(dcs);
-}
-
static int _get_list_of_plugins_json_cb(const DICTIONARY_ITEM *item, void *entry, void *data)
{
UNUSED(item);
@@ -870,10 +888,30 @@ int dyn_conf_init(void)
return 0;
}
-void *dyncfg_main(void *in)
+static void dyncfg_cleanup(void *ptr) {
+ struct netdata_static_thread *static_thread = (struct netdata_static_thread *) ptr;
+ static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
+
+ netdata_log_info("cleaning up...");
+
+ pthread_mutex_lock(&deferred_configs_lock);
+ dyncfg_shutdown = true;
+ while (deferred_configs != NULL) {
+ struct deferred_cfg_send *dcs = deferred_configs;
+ deferred_configs = dcs->next;
+ deferred_config_free(dcs);
+ }
+ pthread_mutex_unlock(&deferred_configs_lock);
+
+ static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
+}
+
+void *dyncfg_main(void *ptr)
{
+ netdata_thread_cleanup_push(dyncfg_cleanup, ptr);
+
while (!netdata_exit) {
- struct deferred_cfg_send *dcs = deferred_config_pop();
+ struct deferred_cfg_send *dcs = deferred_config_pop(ptr);
const DICTIONARY_ITEM *plugin_item = dictionary_get_and_acquire_item(plugins_dict, dcs->plugin_name);
if (plugin_item == NULL) {
error_report("DYNCFG, plugin %s not found", dcs->plugin_name);
@@ -905,5 +943,7 @@ void *dyncfg_main(void *in)
deferred_config_free(dcs);
dictionary_acquired_item_release(plugins_dict, plugin_item);
}
+
+ netdata_thread_cleanup_pop(1);
return NULL;
}