New upstream version 1.9.0+dfsgupstream/1.9.0+dfsg

1 files changed, 50 insertions, 43 deletions

diff --git a/src/rrdvar.c b/src/rrdvar.c
index 2223d7c9a..9119b5384 100644
--- a/src/rrdvar.c
+++ b/src/rrdvar.c
@@ -56,14 +56,17 @@ inline void rrdvar_free(RRDHOST *host, avl_tree_lock *tree, RRDVAR *rv) {
     if(tree) {
         debug(D_VARIABLES, "Deleting variable '%s'", rv->name);
         if(unlikely(!rrdvar_index_del(tree, rv)))
-            error("Attempted to delete variable '%s' from host '%s', but it is not found.", rv->name, host->hostname);
+            error("RRDVAR: Attempted to delete variable '%s' from host '%s', but it is not found.", rv->name, host->hostname);
     }
 
+    if(rv->type == RRDVAR_TYPE_CALCULATED_ALLOCATED)
+        freez(rv->value);
+
     freez(rv->name);
     freez(rv);
 }
 
-inline RRDVAR *rrdvar_create_and_index(const char *scope, avl_tree_lock *tree, const char *name, int type, void *value) {
+inline RRDVAR *rrdvar_create_and_index(const char *scope, avl_tree_lock *tree, const char *name, RRDVAR_TYPE type, void *value) {
     char *variable = strdupz(name);
     rrdvar_fix_name(variable);
     uint32_t hash = simple_hash(variable);
@@ -81,7 +84,8 @@ inline RRDVAR *rrdvar_create_and_index(const char *scope, avl_tree_lock *tree, c
         RRDVAR *ret = rrdvar_index_add(tree, rv);
         if(unlikely(ret != rv)) {
             debug(D_VARIABLES, "Variable '%s' in scope '%s' already exists", variable, scope);
-            rrdvar_free(NULL, NULL, rv);
+            freez(rv);
+            freez(variable);
             rv = NULL;
         }
         else
@@ -101,61 +105,64 @@ inline RRDVAR *rrdvar_create_and_index(const char *scope, avl_tree_lock *tree, c
     return rv;
 }
 
+void rrdvar_free_remaining_variables(RRDHOST *host, avl_tree_lock *tree_lock) {
+    // FIXME: this is not bullet proof - avl should support some means to destroy it
+    // with a callback for each item already in the index
+
+    RRDVAR *rv, *last = NULL;
+    while((rv = (RRDVAR *)tree_lock->avl_tree.root)) {
+        if(unlikely(rv == last)) {
+            error("RRDVAR: INTERNAL ERROR: Cannot cleanup tree of RRDVARs");
+            break;
+        }
+        last = rv;
+        rrdvar_free(host, tree_lock, rv);
+    }
+}
+
 // ----------------------------------------------------------------------------
-// CUSTOM VARIABLES
+// CUSTOM HOST VARIABLES
 
-RRDVAR *rrdvar_custom_host_variable_create(RRDHOST *host, const char *name) {
+inline int rrdvar_callback_for_all_host_variables(RRDHOST *host, int (*callback)(void *rrdvar, void *data), void *data) {
+    return avl_traverse_lock(&host->rrdvar_root_index, callback, data);
+}
+
+static RRDVAR *rrdvar_custom_variable_create(const char *scope, avl_tree_lock *tree_lock, const char *name) {
     calculated_number *v = callocz(1, sizeof(calculated_number));
     *v = NAN;
-    RRDVAR *rv = rrdvar_create_and_index("host", &host->variables_root_index, name, RRDVAR_TYPE_CALCULATED_ALLOCATED, v);
+
+    RRDVAR *rv = rrdvar_create_and_index(scope, tree_lock, name, RRDVAR_TYPE_CALCULATED_ALLOCATED, v);
     if(unlikely(!rv)) {
         free(v);
-        error("Requested variable '%s' already exists - possibly 2 plugins will be updating it at the same time", name);
+        debug(D_VARIABLES, "Requested variable '%s' already exists - possibly 2 plugins are updating it at the same time.", name);
 
         char *variable = strdupz(name);
         rrdvar_fix_name(variable);
         uint32_t hash = simple_hash(variable);
 
-        rv = rrdvar_index_find(&host->variables_root_index, variable, hash);
+        rv = rrdvar_index_find(tree_lock, variable, hash);
+
+        freez(variable);
     }
 
     return rv;
 }
 
-void rrdvar_custom_host_variable_destroy(RRDHOST *host, const char *name) {
-    char *variable = strdupz(name);
-    rrdvar_fix_name(variable);
-    uint32_t hash = simple_hash(variable);
-
-    RRDVAR *rv = rrdvar_index_find(&host->variables_root_index, variable, hash);
-    freez(variable);
-
-    if(!rv) {
-        error("Attempted to remove variable '%s' from host '%s', but it does not exist.", name, host->hostname);
-        return;
-    }
-
-    if(rv->type != RRDVAR_TYPE_CALCULATED_ALLOCATED) {
-        error("Attempted to remove variable '%s' from host '%s', but it does not a custom allocated variable.", name, host->hostname);
-        return;
-    }
-
-    if(!rrdvar_index_del(&host->variables_root_index, rv)) {
-        error("Attempted to remove variable '%s' from host '%s', but it cannot be found.", name, host->hostname);
-        return;
-    }
-
-    freez(rv->name);
-    freez(rv->value);
-    freez(rv);
+RRDVAR *rrdvar_custom_host_variable_create(RRDHOST *host, const char *name) {
+    return rrdvar_custom_variable_create("host", &host->rrdvar_root_index, name);
 }
 
-void rrdvar_custom_host_variable_set(RRDVAR *rv, calculated_number value) {
+void rrdvar_custom_host_variable_set(RRDHOST *host, RRDVAR *rv, calculated_number value) {
     if(rv->type != RRDVAR_TYPE_CALCULATED_ALLOCATED)
         error("requested to set variable '%s' to value " CALCULATED_NUMBER_FORMAT " but the variable is not a custom one.", rv->name, value);
     else {
         calculated_number *v = rv->value;
-        *v = value;
+        if(*v != value) {
+            *v = value;
+
+            // if the host is streaming, send this variable upstream immediately
+            rrdpush_sender_send_this_host_variable_now(host, rv);
+        }
     }
 }
 
@@ -191,7 +198,7 @@ static calculated_number rrdvar2number(RRDVAR *rv) {
         }
 
         default:
-            error("I don't know how to convert RRDVAR type %d to calculated_number", rv->type);
+            error("I don't know how to convert RRDVAR type %u to calculated_number", rv->type);
             return NAN;
     }
 }
@@ -202,19 +209,19 @@ int health_variable_lookup(const char *variable, uint32_t hash, RRDCALC *rc, cal
 
     if(!st) return 0;
 
-    rv = rrdvar_index_find(&st->variables_root_index, variable, hash);
+    rv = rrdvar_index_find(&st->rrdvar_root_index, variable, hash);
     if(rv) {
         *result = rrdvar2number(rv);
         return 1;
     }
 
-    rv = rrdvar_index_find(&st->rrdfamily->variables_root_index, variable, hash);
+    rv = rrdvar_index_find(&st->rrdfamily->rrdvar_root_index, variable, hash);
     if(rv) {
         *result = rrdvar2number(rv);
         return 1;
     }
 
-    rv = rrdvar_index_find(&st->rrdhost->variables_root_index, variable, hash);
+    rv = rrdvar_index_find(&st->rrdhost->rrdvar_root_index, variable, hash);
     if(rv) {
         *result = rrdvar2number(rv);
         return 1;
@@ -253,13 +260,13 @@ void health_api_v1_chart_variables2json(RRDSET *st, BUFFER *buf) {
     };
 
     buffer_sprintf(buf, "{\n\t\"chart\": \"%s\",\n\t\"chart_name\": \"%s\",\n\t\"chart_context\": \"%s\",\n\t\"chart_variables\": {", st->id, st->name, st->context);
-    avl_traverse_lock(&st->variables_root_index, single_variable2json, (void *)&helper);
+    avl_traverse_lock(&st->rrdvar_root_index, single_variable2json, (void *)&helper);
     buffer_sprintf(buf, "\n\t},\n\t\"family\": \"%s\",\n\t\"family_variables\": {", st->family);
     helper.counter = 0;
-    avl_traverse_lock(&st->rrdfamily->variables_root_index, single_variable2json, (void *)&helper);
+    avl_traverse_lock(&st->rrdfamily->rrdvar_root_index, single_variable2json, (void *)&helper);
     buffer_sprintf(buf, "\n\t},\n\t\"host\": \"%s\",\n\t\"host_variables\": {", st->rrdhost->hostname);
     helper.counter = 0;
-    avl_traverse_lock(&st->rrdhost->variables_root_index, single_variable2json, (void *)&helper);
+    avl_traverse_lock(&st->rrdhost->rrdvar_root_index, single_variable2json, (void *)&helper);
     buffer_strcat(buf, "\n\t}\n}\n");
 }