fix compile issues (#13640)
Costa Tsaousis committed
Sep 7, 2022 at 16:54 UTC
d36aa21fda18c5a12bc952abadade6b4495b8d3a
2 files changed
+28
-25
collectors/tc.plugin/plugin_tc.c
+25
-25
@@ -420,19 +420,19 @@ static inline void tc_device_commit(struct tc_device *d) {
420
localhost->rrd_update_every,
421
d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED);
422
423
- rrdlabels_add(d->st_bytes->state->chart_labels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
424
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
425
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
423
+ rrdlabels_add(d->st_bytes->rrdlabels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
424
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
425
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
426
}
427
else {
428
rrdset_next(d->st_bytes);
429
if(unlikely(d->name_updated)) rrdset_set_name(d->st_bytes, string2str(d->name));
430
431
if(d->name && d->name_updated)
432
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
432
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
433
434
if(d->family && d->family_updated)
435
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
435
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
436
437
// TODO
438
// update the family
@@ -481,9 +481,9 @@ static inline void tc_device_commit(struct tc_device *d) {
481
localhost->rrd_update_every,
482
d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED);
483
484
- rrdlabels_add(d->st_bytes->state->chart_labels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
485
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
486
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
484
+ rrdlabels_add(d->st_bytes->rrdlabels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
485
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
486
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
487
}
488
else {
489
rrdset_next(d->st_packets);
@@ -495,10 +495,10 @@ static inline void tc_device_commit(struct tc_device *d) {
495
}
496
497
if(d->name && d->name_updated)
498
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
498
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
499
500
if(d->family && d->family_updated)
501
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
501
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
502
503
// TODO
504
// update the family
@@ -547,9 +547,9 @@ static inline void tc_device_commit(struct tc_device *d) {
547
localhost->rrd_update_every,
548
d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED);
549
550
- rrdlabels_add(d->st_bytes->state->chart_labels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
551
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
552
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
550
+ rrdlabels_add(d->st_bytes->rrdlabels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
551
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
552
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
553
}
554
else {
555
rrdset_next(d->st_dropped);
@@ -561,10 +561,10 @@ static inline void tc_device_commit(struct tc_device *d) {
561
}
562
563
if(d->name && d->name_updated)
564
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
564
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
565
566
if(d->family && d->family_updated)
567
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
567
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
568
569
// TODO
570
// update the family
@@ -613,9 +613,9 @@ static inline void tc_device_commit(struct tc_device *d) {
613
localhost->rrd_update_every,
614
RRDSET_TYPE_LINE);
615
616
- rrdlabels_add(d->st_bytes->state->chart_labels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
617
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
618
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
616
+ rrdlabels_add(d->st_bytes->rrdlabels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
617
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
618
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
619
}
620
else {
621
rrdset_next(d->st_tokens);
@@ -627,10 +627,10 @@ static inline void tc_device_commit(struct tc_device *d) {
627
}
628
629
if(d->name && d->name_updated)
630
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
630
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
631
632
if(d->family && d->family_updated)
633
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
633
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
634
635
// TODO
636
// update the family
@@ -680,9 +680,9 @@ static inline void tc_device_commit(struct tc_device *d) {
680
localhost->rrd_update_every,
681
RRDSET_TYPE_LINE);
682
683
- rrdlabels_add(d->st_bytes->state->chart_labels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
684
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
685
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
683
+ rrdlabels_add(d->st_bytes->rrdlabels, "device", string2str(d->id), RRDLABEL_SRC_AUTO);
684
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name?d->name:d->id), RRDLABEL_SRC_AUTO);
685
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
686
}
687
else {
688
debug(D_TC_LOOP, "TC: Updating _ctokens chart for device '%s'", string2str(d->name?d->name:d->id));
@@ -695,10 +695,10 @@ static inline void tc_device_commit(struct tc_device *d) {
695
}
696
697
if(d->name && d->name_updated)
698
- rrdlabels_add(d->st_bytes->state->chart_labels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
698
+ rrdlabels_add(d->st_bytes->rrdlabels, "name", string2str(d->name), RRDLABEL_SRC_AUTO);
699
700
if(d->family && d->family_updated)
701
- rrdlabels_add(d->st_bytes->state->chart_labels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
701
+ rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family), RRDLABEL_SRC_AUTO);
702
703
// TODO
704
// update the family
libnetdata/arrayalloc/arrayalloc.c
+3
@@ -218,6 +218,9 @@ ARAL *arrayalloc_create(size_t element_size, size_t elements, const char *filena
218
}
219
220
void *arrayalloc_mallocz(ARAL *ar) {
221
+ if(unlikely(!ar->internal.initialized))
222
+ arrayalloc_init(ar);
223
+
224
arrayalloc_lock(ar);
225
226
if(unlikely(!ar->internal.first_page || !ar->internal.first_page->free_list))