fixes left-overs from moving context index to family index
Costa Tsaousis committed
Aug 20, 2016 at 23:38 UTC
0f5979a8fec5ab8bb2c694edafc87093f8ed900c
2 files changed
+27
-27
src/health.c
+22
-22
@@ -172,7 +172,7 @@ int health_variable_lookup(const char *variable, uint32_t hash, RRDCALC *rc, cal
172
debug(D_HEALTH, "Available local chart '%s' variables:", st->id);
173
avl_traverse_lock(&st->variables_root_index, dump_variable);
174
175
- debug(D_HEALTH, "Available context '%s' variables:", st->rrdfamily->family);
175
+ debug(D_HEALTH, "Available family '%s' variables:", st->rrdfamily->family);
176
avl_traverse_lock(&st->rrdfamily->variables_root_index, dump_variable);
177
178
debug(D_HEALTH, "Available host '%s' variables:", st->rrdhost->hostname);
@@ -202,11 +202,11 @@ RRDSETVAR *rrdsetvar_create(RRDSET *st, const char *variable, int type, void *va
202
rs->options = options;
203
rs->rrdset = st;
204
205
- rs->local = rrdvar_create_and_index("local", &st->variables_root_index, rs->variable, rs->type, rs->value);
206
- rs->context = rrdvar_create_and_index("context", &st->rrdfamily->variables_root_index, rs->fullid, rs->type, rs->value);
207
- rs->host = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullid, rs->type, rs->value);
208
- rs->context_name = rrdvar_create_and_index("context", &st->rrdfamily->variables_root_index, rs->fullname, rs->type, rs->value);
209
- rs->host_name = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullname, rs->type, rs->value);
205
+ rs->local = rrdvar_create_and_index("local", &st->variables_root_index, rs->variable, rs->type, rs->value);
206
+ rs->family = rrdvar_create_and_index("family", &st->rrdfamily->variables_root_index, rs->fullid, rs->type, rs->value);
207
+ rs->host = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullid, rs->type, rs->value);
208
+ rs->family_name = rrdvar_create_and_index("family", &st->rrdfamily->variables_root_index, rs->fullname, rs->type, rs->value);
209
+ rs->host_name = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullname, rs->type, rs->value);
210
211
rs->next = st->variables;
212
st->variables = rs;
@@ -218,7 +218,7 @@ void rrdsetvar_rename_all(RRDSET *st) {
218
debug(D_VARIABLES, "RRDSETVAR rename for chart id '%s' name '%s'", st->id, st->name);
219
220
// only these 2 can change name
221
- // rs->context_name
221
+ // rs->family_name
222
// rs->host_name
223
224
char buffer[RRDVAR_MAX_LENGTH + 1];
@@ -230,13 +230,13 @@ void rrdsetvar_rename_all(RRDSET *st) {
230
231
if (strcmp(buffer, rs->fullname)) {
232
// name changed
233
- rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->context_name);
233
+ rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->family_name);
234
rrdvar_free(st->rrdhost, &st->rrdhost->variables_root_index, rs->host_name);
235
236
freez(rs->fullname);
237
rs->fullname = strdupz(st->name);
238
- rs->context_name = rrdvar_create_and_index("context", &st->rrdfamily->variables_root_index, rs->fullname, rs->type, rs->value);
239
- rs->host_name = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullname, rs->type, rs->value);
238
+ rs->family_name = rrdvar_create_and_index("family", &st->rrdfamily->variables_root_index, rs->fullname, rs->type, rs->value);
239
+ rs->host_name = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullname, rs->type, rs->value);
240
}
241
}
242
@@ -248,9 +248,9 @@ void rrdsetvar_free(RRDSETVAR *rs) {
248
debug(D_VARIABLES, "RRDSETVAR free for chart id '%s' name '%s', variable '%s'", st->id, st->name, rs->variable);
249
250
rrdvar_free(st->rrdhost, &st->variables_root_index, rs->local);
251
- rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->context);
251
+ rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->family);
252
rrdvar_free(st->rrdhost, &st->rrdhost->variables_root_index, rs->host);
253
- rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->context_name);
253
+ rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->family_name);
254
rrdvar_free(st->rrdhost, &st->rrdhost->variables_root_index, rs->host_name);
255
256
if(st->variables == rs) {
@@ -311,11 +311,11 @@ RRDDIMVAR *rrddimvar_create(RRDDIM *rd, int type, const char *prefix, const char
311
rs->options = options;
312
rs->rrddim = rd;
313
314
- rs->local_id = rrdvar_create_and_index("local", &st->variables_root_index, rs->id, rs->type, rs->value);
315
- rs->local_name = rrdvar_create_and_index("local", &st->variables_root_index, rs->name, rs->type, rs->value);
314
+ rs->local_id = rrdvar_create_and_index("local", &st->variables_root_index, rs->id, rs->type, rs->value);
315
+ rs->local_name = rrdvar_create_and_index("local", &st->variables_root_index, rs->name, rs->type, rs->value);
316
317
- rs->context_id = rrdvar_create_and_index("context", &st->rrdfamily->variables_root_index, rs->id, rs->type, rs->value);
318
- rs->context_name = rrdvar_create_and_index("context", &st->rrdfamily->variables_root_index, rs->name, rs->type, rs->value);
317
+ rs->family_id = rrdvar_create_and_index("family", &st->rrdfamily->variables_root_index, rs->id, rs->type, rs->value);
318
+ rs->family_name = rrdvar_create_and_index("family", &st->rrdfamily->variables_root_index, rs->name, rs->type, rs->value);
319
320
rs->host_fullidid = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullidid, rs->type, rs->value);
321
rs->host_fullidname = rrdvar_create_and_index("host", &st->rrdhost->variables_root_index, rs->fullidname, rs->type, rs->value);
@@ -381,8 +381,8 @@ void rrddimvar_free(RRDDIMVAR *rs) {
381
rrdvar_free(st->rrdhost, &st->variables_root_index, rs->local_id);
382
rrdvar_free(st->rrdhost, &st->variables_root_index, rs->local_name);
383
384
- rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->context_id);
385
- rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->context_name);
384
+ rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->family_id);
385
+ rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rs->family_name);
386
387
rrdvar_free(st->rrdhost, &st->rrdhost->variables_root_index, rs->host_fullidid);
388
rrdvar_free(st->rrdhost, &st->rrdhost->variables_root_index, rs->host_fullidname);
@@ -431,8 +431,8 @@ static void rrdsetcalc_link(RRDSET *st, RRDCALC *rc) {
431
if(rc->red && !st->red)
432
st->red = rc->red;
433
434
- rc->local = rrdvar_create_and_index("local", &st->variables_root_index, rc->name, RRDVAR_TYPE_CALCULATED, &rc->value);
435
- rc->context = rrdvar_create_and_index("context", &st->rrdfamily->variables_root_index, rc->name, RRDVAR_TYPE_CALCULATED, &rc->value);
434
+ rc->local = rrdvar_create_and_index("local", &st->variables_root_index, rc->name, RRDVAR_TYPE_CALCULATED, &rc->value);
435
+ rc->family = rrdvar_create_and_index("family", &st->rrdfamily->variables_root_index, rc->name, RRDVAR_TYPE_CALCULATED, &rc->value);
436
437
char fullname[RRDVAR_MAX_LENGTH + 1];
438
snprintfz(fullname, RRDVAR_MAX_LENGTH, "%s.%s", st->id, rc->name);
@@ -491,8 +491,8 @@ inline void rrdsetcalc_unlink(RRDCALC *rc) {
491
rrdvar_free(st->rrdhost, &st->variables_root_index, rc->local);
492
rc->local = NULL;
493
494
- rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rc->context);
495
- rc->context = NULL;
494
+ rrdvar_free(st->rrdhost, &st->rrdfamily->variables_root_index, rc->family);
495
+ rc->family = NULL;
496
497
rrdvar_free(st->rrdhost, &st->rrdhost->variables_root_index, rc->hostid);
498
rc->hostid = NULL;
src/health.h
+5
-5
@@ -44,9 +44,9 @@ typedef struct rrdsetvar {
44
uint32_t options;
45
46
RRDVAR *local;
47
- RRDVAR *context;
47
+ RRDVAR *family;
48
RRDVAR *host;
49
- RRDVAR *context_name;
49
+ RRDVAR *family_name;
50
RRDVAR *host_name;
51
52
struct rrdset *rrdset;
@@ -79,8 +79,8 @@ typedef struct rrddimvar {
79
RRDVAR *local_id;
80
RRDVAR *local_name;
81
82
- RRDVAR *context_id;
83
- RRDVAR *context_name;
82
+ RRDVAR *family_id;
83
+ RRDVAR *family_name;
84
85
RRDVAR *host_fullidid;
86
RRDVAR *host_fullidname;
@@ -160,7 +160,7 @@ typedef struct rrdcalc {
160
calculated_number red;
161
162
RRDVAR *local;
163
- RRDVAR *context;
163
+ RRDVAR *family;
164
RRDVAR *hostid;
165
RRDVAR *hostname;
166