Merging upstream version 1.37.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 173 insertions, 118 deletions

diff --git a/database/rrddimvar.c b/database/rrddimvar.c
index 3c2ed75e..449ceeb9 100644
--- a/database/rrddimvar.c
+++ b/database/rrddimvar.c
@@ -1,84 +1,87 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#define NETDATA_HEALTH_INTERNALS
 #include "rrd.h"
 
+typedef struct rrddimvar {
+    struct rrddim *rrddim;
+
+    STRING *prefix;
+    STRING *suffix;
+    void *value;
+
+    const RRDVAR_ACQUIRED *rrdvar_local_dim_id;
+    const RRDVAR_ACQUIRED *rrdvar_local_dim_name;
+
+    const RRDVAR_ACQUIRED *rrdvar_family_id;
+    const RRDVAR_ACQUIRED *rrdvar_family_name;
+    const RRDVAR_ACQUIRED *rrdvar_family_context_dim_id;
+    const RRDVAR_ACQUIRED *rrdvar_family_context_dim_name;
+
+    const RRDVAR_ACQUIRED *rrdvar_host_chart_id_dim_id;
+    const RRDVAR_ACQUIRED *rrdvar_host_chart_id_dim_name;
+    const RRDVAR_ACQUIRED *rrdvar_host_chart_name_dim_id;
+    const RRDVAR_ACQUIRED *rrdvar_host_chart_name_dim_name;
+
+    RRDVAR_FLAGS flags:24;
+    RRDVAR_TYPE type:8;
+} RRDDIMVAR;
+
 // ----------------------------------------------------------------------------
 // RRDDIMVAR management
 // DIMENSION VARIABLES
 
 #define RRDDIMVAR_ID_MAX 1024
 
-static inline void rrddimvar_free_variables(RRDDIMVAR *rs) {
+static inline void rrddimvar_free_variables_unsafe(RRDDIMVAR *rs) {
     RRDDIM *rd = rs->rrddim;
     RRDSET *st = rd->rrdset;
     RRDHOST *host = st->rrdhost;
 
     // CHART VARIABLES FOR THIS DIMENSION
 
-    rrdvar_free(host, &st->rrdvar_root_index, rs->var_local_id);
-    rs->var_local_id = NULL;
+    if(st->rrdvars) {
+        rrdvar_release_and_del(st->rrdvars, rs->rrdvar_local_dim_id);
+        rs->rrdvar_local_dim_id = NULL;
 
-    rrdvar_free(host, &st->rrdvar_root_index, rs->var_local_name);
-    rs->var_local_name = NULL;
+        rrdvar_release_and_del(st->rrdvars, rs->rrdvar_local_dim_name);
+        rs->rrdvar_local_dim_name = NULL;
+    }
 
     // FAMILY VARIABLES FOR THIS DIMENSION
 
-    rrdvar_free(host, &st->rrdfamily->rrdvar_root_index, rs->var_family_id);
-    rs->var_family_id = NULL;
+    if(st->rrdfamily) {
+        rrdvar_release_and_del(rrdfamily_rrdvars_dict(st->rrdfamily), rs->rrdvar_family_id);
+        rs->rrdvar_family_id = NULL;
 
-    rrdvar_free(host, &st->rrdfamily->rrdvar_root_index, rs->var_family_name);
-    rs->var_family_name = NULL;
+        rrdvar_release_and_del(rrdfamily_rrdvars_dict(st->rrdfamily), rs->rrdvar_family_name);
+        rs->rrdvar_family_name = NULL;
 
-    rrdvar_free(host, &st->rrdfamily->rrdvar_root_index, rs->var_family_contextid);
-    rs->var_family_contextid = NULL;
+        rrdvar_release_and_del(rrdfamily_rrdvars_dict(st->rrdfamily), rs->rrdvar_family_context_dim_id);
+        rs->rrdvar_family_context_dim_id = NULL;
 
-    rrdvar_free(host, &st->rrdfamily->rrdvar_root_index, rs->var_family_contextname);
-    rs->var_family_contextname = NULL;
+        rrdvar_release_and_del(rrdfamily_rrdvars_dict(st->rrdfamily), rs->rrdvar_family_context_dim_name);
+        rs->rrdvar_family_context_dim_name = NULL;
+    }
 
     // HOST VARIABLES FOR THIS DIMENSION
 
-    rrdvar_free(host, &host->rrdvar_root_index, rs->var_host_chartidid);
-    rs->var_host_chartidid = NULL;
-
-    rrdvar_free(host, &host->rrdvar_root_index, rs->var_host_chartidname);
-    rs->var_host_chartidname = NULL;
-
-    rrdvar_free(host, &host->rrdvar_root_index, rs->var_host_chartnameid);
-    rs->var_host_chartnameid = NULL;
-
-    rrdvar_free(host, &host->rrdvar_root_index, rs->var_host_chartnamename);
-    rs->var_host_chartnamename = NULL;
+    if(host->rrdvars && host->health_enabled) {
+        rrdvar_release_and_del(host->rrdvars, rs->rrdvar_host_chart_id_dim_id);
+        rs->rrdvar_host_chart_id_dim_id = NULL;
 
-    // KEYS
-
-    freez(rs->key_id);
-    rs->key_id = NULL;
-
-    freez(rs->key_name);
-    rs->key_name = NULL;
-
-    freez(rs->key_fullidid);
-    rs->key_fullidid = NULL;
-
-    freez(rs->key_fullidname);
-    rs->key_fullidname = NULL;
-
-    freez(rs->key_contextid);
-    rs->key_contextid = NULL;
+        rrdvar_release_and_del(host->rrdvars, rs->rrdvar_host_chart_id_dim_name);
+        rs->rrdvar_host_chart_id_dim_name = NULL;
 
-    freez(rs->key_contextname);
-    rs->key_contextname = NULL;
+        rrdvar_release_and_del(host->rrdvars, rs->rrdvar_host_chart_name_dim_id);
+        rs->rrdvar_host_chart_name_dim_id = NULL;
 
-    freez(rs->key_fullnameid);
-    rs->key_fullnameid = NULL;
-
-    freez(rs->key_fullnamename);
-    rs->key_fullnamename = NULL;
+        rrdvar_release_and_del(host->rrdvars, rs->rrdvar_host_chart_name_dim_name);
+        rs->rrdvar_host_chart_name_dim_name = NULL;
+    }
 }
 
-static inline void rrddimvar_create_variables(RRDDIMVAR *rs) {
-    rrddimvar_free_variables(rs);
+static inline void rrddimvar_update_variables_unsafe(RRDDIMVAR *rs) {
+    rrddimvar_free_variables_unsafe(rs);
 
     RRDDIM *rd = rs->rrddim;
     RRDSET *st = rd->rrdset;
@@ -88,29 +91,29 @@ static inline void rrddimvar_create_variables(RRDDIMVAR *rs) {
 
     // KEYS
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s%s%s", rs->prefix, rd->id, rs->suffix);
-    rs->key_id = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s%s%s", string2str(rs->prefix), rrddim_id(rd), string2str(rs->suffix));
+    STRING *key_dim_id = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s%s%s", rs->prefix, rd->name, rs->suffix);
-    rs->key_name = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s%s%s", string2str(rs->prefix), rrddim_name(rd), string2str(rs->suffix));
+    STRING *key_dim_name = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", st->id, rs->key_id);
-    rs->key_fullidid = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", rrdset_id(st), string2str(key_dim_id));
+    STRING *key_chart_id_dim_id = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", st->id, rs->key_name);
-    rs->key_fullidname = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", rrdset_id(st), string2str(key_dim_name));
+    STRING *key_chart_id_dim_name = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", st->context, rs->key_id);
-    rs->key_contextid = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", rrdset_context(st), string2str(key_dim_id));
+    STRING *key_context_dim_id = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", st->context, rs->key_name);
-    rs->key_contextname = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", rrdset_context(st), string2str(key_dim_name));
+    STRING *key_context_dim_name = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", st->name, rs->key_id);
-    rs->key_fullnameid = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", rrdset_name(st), string2str(key_dim_id));
+    STRING *key_chart_name_dim_id = string_strdupz(buffer);
 
-    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", st->name, rs->key_name);
-    rs->key_fullnamename = strdupz(buffer);
+    snprintfz(buffer, RRDDIMVAR_ID_MAX, "%s.%s", rrdset_name(st), string2str(key_dim_name));
+    STRING *key_chart_name_dim_name = string_strdupz(buffer);
 
     // CHART VARIABLES FOR THIS DIMENSION
     // -----------------------------------
@@ -119,8 +122,10 @@ static inline void rrddimvar_create_variables(RRDDIMVAR *rs) {
     // - $id
     // - $name
 
-    rs->var_local_id           = rrdvar_create_and_index("local", &st->rrdvar_root_index, rs->key_id, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_local_name         = rrdvar_create_and_index("local", &st->rrdvar_root_index, rs->key_name, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
+    if(st->rrdvars) {
+        rs->rrdvar_local_dim_id = rrdvar_add_and_acquire("local", st->rrdvars, key_dim_id, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_local_dim_name = rrdvar_add_and_acquire("local", st->rrdvars, key_dim_name, rs->type, RRDVAR_FLAG_NONE, rs->value);
+    }
 
     // FAMILY VARIABLES FOR THIS DIMENSION
     // -----------------------------------
@@ -131,10 +136,12 @@ static inline void rrddimvar_create_variables(RRDDIMVAR *rs) {
     // - $chart-context.id
     // - $chart-context.name
 
-    rs->var_family_id          = rrdvar_create_and_index("family", &st->rrdfamily->rrdvar_root_index, rs->key_id, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_family_name        = rrdvar_create_and_index("family", &st->rrdfamily->rrdvar_root_index, rs->key_name, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_family_contextid   = rrdvar_create_and_index("family", &st->rrdfamily->rrdvar_root_index, rs->key_contextid, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_family_contextname = rrdvar_create_and_index("family", &st->rrdfamily->rrdvar_root_index, rs->key_contextname, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
+    if(st->rrdfamily) {
+        rs->rrdvar_family_id = rrdvar_add_and_acquire("family", rrdfamily_rrdvars_dict(st->rrdfamily), key_dim_id, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_family_name = rrdvar_add_and_acquire("family", rrdfamily_rrdvars_dict(st->rrdfamily), key_dim_name, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_family_context_dim_id = rrdvar_add_and_acquire("family", rrdfamily_rrdvars_dict(st->rrdfamily), key_context_dim_id, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_family_context_dim_name = rrdvar_add_and_acquire("family", rrdfamily_rrdvars_dict(st->rrdfamily), key_context_dim_name, rs->type, RRDVAR_FLAG_NONE, rs->value);
+    }
 
     // HOST VARIABLES FOR THIS DIMENSION
     // -----------------------------------
@@ -145,73 +152,121 @@ static inline void rrddimvar_create_variables(RRDDIMVAR *rs) {
     // - $chart-name.id
     // - $chart-name.name
 
-    rs->var_host_chartidid      = rrdvar_create_and_index("host", &host->rrdvar_root_index, rs->key_fullidid, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_host_chartidname    = rrdvar_create_and_index("host", &host->rrdvar_root_index, rs->key_fullidname, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_host_chartnameid    = rrdvar_create_and_index("host", &host->rrdvar_root_index, rs->key_fullnameid, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
-    rs->var_host_chartnamename  = rrdvar_create_and_index("host", &host->rrdvar_root_index, rs->key_fullnamename, rs->type, RRDVAR_OPTION_DEFAULT, rs->value);
+    if(host->rrdvars && host->health_enabled) {
+        rs->rrdvar_host_chart_id_dim_id = rrdvar_add_and_acquire("host", host->rrdvars, key_chart_id_dim_id, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_host_chart_id_dim_name = rrdvar_add_and_acquire("host", host->rrdvars, key_chart_id_dim_name, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_host_chart_name_dim_id = rrdvar_add_and_acquire("host", host->rrdvars, key_chart_name_dim_id, rs->type, RRDVAR_FLAG_NONE, rs->value);
+        rs->rrdvar_host_chart_name_dim_name = rrdvar_add_and_acquire("host", host->rrdvars, key_chart_name_dim_name, rs->type, RRDVAR_FLAG_NONE, rs->value);
+    }
+
+    // free the keys
+
+    string_freez(key_dim_id);
+    string_freez(key_dim_name);
+    string_freez(key_chart_id_dim_id);
+    string_freez(key_chart_id_dim_name);
+    string_freez(key_context_dim_id);
+    string_freez(key_context_dim_name);
+    string_freez(key_chart_name_dim_id);
+    string_freez(key_chart_name_dim_name);
 }
 
-RRDDIMVAR *rrddimvar_create(RRDDIM *rd, RRDVAR_TYPE type, const char *prefix, const char *suffix, void *value, RRDVAR_OPTIONS options) {
-    RRDSET *st = rd->rrdset;
-    (void)st;
+struct rrddimvar_constructor {
+    RRDDIM *rrddim;
+    const char *prefix;
+    const char *suffix;
+    void *value;
+    RRDVAR_FLAGS flags :16;
+    RRDVAR_TYPE type:8;
+};
 
-    debug(D_VARIABLES, "RRDDIMSET create for chart id '%s' name '%s', dimension id '%s', name '%s%s%s'", st->id, st->name, rd->id, (prefix)?prefix:"", rd->name, (suffix)?suffix:"");
+static void rrddimvar_insert_callback(const DICTIONARY_ITEM *item __maybe_unused, void *rrddimvar, void *constructor_data) {
+    RRDDIMVAR *rs = rrddimvar;
+    struct rrddimvar_constructor *ctr = constructor_data;
 
-    if(!prefix) prefix = "";
-    if(!suffix) suffix = "";
+    if(!ctr->prefix) ctr->prefix = "";
+    if(!ctr->suffix) ctr->suffix = "";
+
+    rs->prefix = string_strdupz(ctr->prefix);
+    rs->suffix = string_strdupz(ctr->suffix);
+
+    rs->type = ctr->type;
+    rs->value = ctr->value;
+    rs->flags = ctr->flags;
+    rs->rrddim = ctr->rrddim;
+
+    rrddimvar_update_variables_unsafe(rs);
+}
+
+static bool rrddimvar_conflict_callback(const DICTIONARY_ITEM *item __maybe_unused, void *rrddimvar, void *new_rrddimvar __maybe_unused, void *constructor_data __maybe_unused) {
+    RRDDIMVAR *rs = rrddimvar;
+    rrddimvar_update_variables_unsafe(rs);
+
+    return true;
+}
 
-    RRDDIMVAR *rs = (RRDDIMVAR *)callocz(1, sizeof(RRDDIMVAR));
+static void rrddimvar_delete_callback(const DICTIONARY_ITEM *item __maybe_unused, void *rrddimvar, void *rrdset __maybe_unused) {
+    RRDDIMVAR *rs = rrddimvar;
+    rrddimvar_free_variables_unsafe(rs);
+    string_freez(rs->prefix);
+    string_freez(rs->suffix);
+}
 
-    rs->prefix = strdupz(prefix);
-    rs->suffix = strdupz(suffix);
+void rrddimvar_index_init(RRDSET *st) {
+    if(!st->rrddimvar_root_index) {
+        st->rrddimvar_root_index = dictionary_create(DICT_OPTION_DONT_OVERWRITE_VALUE);
 
-    rs->type = type;
-    rs->value = value;
-    rs->options = options;
-    rs->rrddim = rd;
+        dictionary_register_insert_callback(st->rrddimvar_root_index, rrddimvar_insert_callback, NULL);
+        dictionary_register_conflict_callback(st->rrddimvar_root_index, rrddimvar_conflict_callback, NULL);
+        dictionary_register_delete_callback(st->rrddimvar_root_index, rrddimvar_delete_callback, st);
+    }
+}
 
-    rs->next = rd->variables;
-    rd->variables = rs;
+void rrddimvar_index_destroy(RRDSET *st) {
+    dictionary_destroy(st->rrddimvar_root_index);
+    st->rrddimvar_root_index = NULL;
+}
 
-    rrddimvar_create_variables(rs);
+void rrddimvar_add_and_leave_released(RRDDIM *rd, RRDVAR_TYPE type, const char *prefix, const char *suffix, void *value, RRDVAR_FLAGS flags) {
+    if(!prefix) prefix = "";
+    if(!suffix) suffix = "";
 
-    return rs;
+    char key[RRDDIMVAR_ID_MAX + 1];
+    size_t key_len = snprintfz(key, RRDDIMVAR_ID_MAX, "%s_%s_%s", prefix, rrddim_id(rd), suffix);
+
+    struct rrddimvar_constructor tmp = {
+        .suffix = suffix,
+        .prefix = prefix,
+        .type = type,
+        .flags = flags,
+        .value = value,
+        .rrddim = rd
+    };
+    dictionary_set_advanced(rd->rrdset->rrddimvar_root_index, key, (ssize_t)(key_len + 1), NULL, sizeof(RRDDIMVAR), &tmp);
 }
 
 void rrddimvar_rename_all(RRDDIM *rd) {
     RRDSET *st = rd->rrdset;
-    (void)st;
 
-    debug(D_VARIABLES, "RRDDIMSET rename for chart id '%s' name '%s', dimension id '%s', name '%s'", st->id, st->name, rd->id, rd->name);
+    debug(D_VARIABLES, "RRDDIMVAR rename for chart id '%s' name '%s', dimension id '%s', name '%s'", rrdset_id(st), rrdset_name(st), rrddim_id(rd), rrddim_name(rd));
 
-    RRDDIMVAR *rs, *next = rd->variables;
-    while((rs = next)) {
-        next = rs->next;
-        rrddimvar_create_variables(rs);
+    RRDDIMVAR *rs;
+    dfe_start_write(st->rrddimvar_root_index, rs) {
+        if(unlikely(rs->rrddim == rd))
+            rrddimvar_update_variables_unsafe(rs);
     }
+    dfe_done(rs);
 }
 
-void rrddimvar_free(RRDDIMVAR *rs) {
-    RRDDIM *rd = rs->rrddim;
+void rrddimvar_delete_all(RRDDIM *rd) {
     RRDSET *st = rd->rrdset;
-    debug(D_VARIABLES, "RRDDIMSET free for chart id '%s' name '%s', dimension id '%s', name '%s', prefix='%s', suffix='%s'", st->id, st->name, rd->id, rd->name, rs->prefix, rs->suffix);
 
-    rrddimvar_free_variables(rs);
+    debug(D_VARIABLES, "RRDDIMVAR delete for chart id '%s' name '%s', dimension id '%s', name '%s'", rrdset_id(st), rrdset_name(st), rrddim_id(rd), rrddim_name(rd));
 
-    if(rd->variables == rs) {
-        debug(D_VARIABLES, "RRDDIMSET removing first entry for chart id '%s' name '%s', dimension id '%s', name '%s'", st->id, st->name, rd->id, rd->name);
-        rd->variables = rs->next;
-    }
-    else {
-        debug(D_VARIABLES, "RRDDIMSET removing non-first entry for chart id '%s' name '%s', dimension id '%s', name '%s'", st->id, st->name, rd->id, rd->name);
-        RRDDIMVAR *t;
-        for (t = rd->variables; t && t->next != rs; t = t->next) ;
-        if(!t) error("RRDDIMVAR '%s' not found in dimension '%s/%s' variables linked list", rs->key_name, st->id, rd->id);
-        else t->next = rs->next;
+    RRDDIMVAR *rs;
+    dfe_start_write(st->rrddimvar_root_index, rs) {
+        if(unlikely(rs->rrddim == rd))
+            dictionary_del(st->rrddimvar_root_index, rs_dfe.name);
     }
-
-    freez(rs->prefix);
-    freez(rs->suffix);
-    freez(rs);
+    dfe_done(rs);
 }
-