added rendering qos tokens and ctokens to help further development of class depletion charts; #822
Costa Tsaousis (ktsaou) committed
Sep 21, 2016 at 00:25 UTC
1d0c47766a4b5e9409898a56c5479870335e2556
1 file changed
+133
-4
src/plugin_tc.c
+133
-4
@@ -39,6 +39,8 @@ struct tc_class {
39
RRDDIM *rd_bytes;
40
RRDDIM *rd_packets;
41
RRDDIM *rd_dropped;
42
+ RRDDIM *rd_tokens;
43
+ RRDDIM *rd_ctokens;
44
45
char name_updated;
46
char updated; // updated bytes
@@ -64,10 +66,14 @@ struct tc_device {
66
char enabled_bytes;
67
char enabled_packets;
68
char enabled_dropped;
69
+ char enabled_tokens;
70
+ char enabled_ctokens;
71
72
RRDSET *st_bytes;
73
RRDSET *st_packets;
74
RRDSET *st_dropped;
75
+ RRDSET *st_tokens;
76
+ RRDSET *st_ctokens;
77
78
avl_tree classes_index;
79
@@ -177,18 +183,20 @@ static inline void tc_device_classes_cleanup(struct tc_device *d) {
183
}
184
185
static inline void tc_device_commit(struct tc_device *d) {
180
- static int enable_new_interfaces = -1, enable_bytes = -1, enable_packets = -1, enable_dropped = -1;
186
+ static int enable_new_interfaces = -1, enable_bytes = -1, enable_packets = -1, enable_dropped = -1, enable_tokens = -1, enable_ctokens = -1;
187
188
if(unlikely(enable_new_interfaces == -1)) {
189
enable_new_interfaces = config_get_boolean_ondemand("plugin:tc", "enable new interfaces detected at runtime", CONFIG_ONDEMAND_YES);
190
enable_bytes = config_get_boolean_ondemand("plugin:tc", "enable traffic charts for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
191
enable_packets = config_get_boolean_ondemand("plugin:tc", "enable packets charts for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
192
enable_dropped = config_get_boolean_ondemand("plugin:tc", "enable dropped charts for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
193
+ enable_tokens = config_get_boolean_ondemand("plugin:tc", "enable tokens charts for all interfaces", CONFIG_ONDEMAND_NO);
194
+ enable_ctokens = config_get_boolean_ondemand("plugin:tc", "enable ctokens charts for all interfaces", CONFIG_ONDEMAND_NO);
195
}
196
197
// we only need to add leaf classes
198
struct tc_class *c, *x;
191
- unsigned long long bytes_sum = 0, packets_sum = 0, dropped_sum = 0;
199
+ unsigned long long bytes_sum = 0, packets_sum = 0, dropped_sum = 0, tokens_sum = 0, ctokens_sum = 0;
200
int active_classes = 0;
201
202
// set all classes
@@ -234,6 +242,8 @@ static inline void tc_device_commit(struct tc_device *d) {
242
bytes_sum += c->bytes;
243
packets_sum += c->packets;
244
dropped_sum += c->dropped;
245
+ tokens_sum += c->tokens;
246
+ ctokens_sum += c->ctokens;
247
}
248
}
249
@@ -256,18 +266,29 @@ static inline void tc_device_commit(struct tc_device *d) {
266
267
snprintfz(var_name, CONFIG_MAX_NAME, "dropped packets chart for %s", d->id);
268
d->enabled_dropped = config_get_boolean_ondemand("plugin:tc", var_name, enable_dropped);
269
+
270
+ snprintfz(var_name, CONFIG_MAX_NAME, "dropped tokens chart for %s", d->id);
271
+ d->enabled_tokens = config_get_boolean_ondemand("plugin:tc", var_name, enable_tokens);
272
+
273
+ snprintfz(var_name, CONFIG_MAX_NAME, "dropped ctokens chart for %s", d->id);
274
+ d->enabled_ctokens = config_get_boolean_ondemand("plugin:tc", var_name, enable_ctokens);
275
}
276
261
- debug(D_TC_LOOP, "TC: evaluating TC device '%s'. enabled = %d/%d (bytes: %d/%d, packets: %d/%d, dropped: %d/%d), classes = %d (bytes = %llu, packets = %llu, dropped = %llu).",
277
+ debug(D_TC_LOOP, "TC: evaluating TC device '%s'. enabled = %d/%d (bytes: %d/%d, packets: %d/%d, dropped: %d/%d, tokens: %d/%d, ctokens: %d/%d), classes = %d (bytes = %llu, packets = %llu, dropped = %llu, tokens = %llu, ctokens = %llu).",
278
d->name?d->name:d->id,
279
d->enabled, enable_new_interfaces,
280
d->enabled_bytes, enable_bytes,
281
d->enabled_packets, enable_packets,
282
d->enabled_dropped, enable_dropped,
283
+ d->enabled_tokens, enable_tokens,
284
+ d->enabled_ctokens, enable_ctokens,
285
active_classes,
286
bytes_sum,
287
packets_sum,
270
- dropped_sum);
288
+ dropped_sum,
289
+ tokens_sum,
290
+ ctokens_sum
291
+ );
292
293
if(likely(d->enabled)) {
294
// --------------------------------------------------------------------
@@ -433,6 +454,114 @@ static inline void tc_device_commit(struct tc_device *d) {
454
}
455
rrdset_done(d->st_dropped);
456
}
457
+
458
+ // --------------------------------------------------------------------
459
+ // tokens
460
+
461
+ if(d->enabled_tokens == CONFIG_ONDEMAND_YES || (d->enabled_tokens == CONFIG_ONDEMAND_ONDEMAND && tokens_sum)) {
462
+ d->enabled_tokens = CONFIG_ONDEMAND_YES;
463
+
464
+ if(unlikely(!d->st_tokens)) {
465
+ char id[RRD_ID_LENGTH_MAX + 1];
466
+ char name[RRD_ID_LENGTH_MAX + 1];
467
+ snprintfz(id, RRD_ID_LENGTH_MAX, "%s_tokens", d->id);
468
+ snprintfz(name, RRD_ID_LENGTH_MAX, "%s_tokens", d->name?d->name:d->id);
469
+
470
+ d->st_tokens = rrdset_find_bytype(RRD_TYPE_TC, id);
471
+ if(unlikely(!d->st_tokens)) {
472
+ debug(D_TC_LOOP, "TC: Creating new _tokens chart for device '%s'", d->name?d->name:d->id);
473
+ d->st_tokens = rrdset_create(RRD_TYPE_TC, id, name, d->family?d->family:d->id, RRD_TYPE_TC ".qos_tokens", "Class Tokens", "tokens", 7030, rrd_update_every, RRDSET_TYPE_LINE);
474
+ }
475
+ }
476
+ else {
477
+ debug(D_TC_LOOP, "TC: Updating _tokens chart for device '%s'", d->name?d->name:d->id);
478
+ rrdset_next_plugins(d->st_tokens);
479
+
480
+ // FIXME
481
+ // update the family
482
+ }
483
+
484
+ for(c = d->classes ; c ; c = c->next) {
485
+ if(unlikely(!c->updated)) continue;
486
+
487
+ if(c->isleaf && c->hasparent) {
488
+ if(unlikely(!c->rd_tokens)) {
489
+ c->rd_tokens = rrddim_find(d->st_tokens, c->id);
490
+ if(unlikely(!c->rd_tokens)) {
491
+ debug(D_TC_LOOP, "TC: Adding to chart '%s', dimension '%s' (name: '%s')", d->st_tokens->id, c->id, c->name);
492
+
493
+ // new class, we have to add it
494
+ c->rd_tokens = rrddim_add(d->st_tokens, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ABSOLUTE);
495
+ }
496
+ else debug(D_TC_LOOP, "TC: Updating chart '%s', dimension '%s'", d->st_tokens->id, c->id);
497
+ }
498
+
499
+ rrddim_set_by_pointer(d->st_tokens, c->rd_tokens, c->tokens);
500
+
501
+ // if it has a name, different to the id
502
+ if(unlikely(c->name_updated && c->name && strcmp(c->id, c->name) != 0)) {
503
+ // update the rrd dimension with the new name
504
+ debug(D_TC_LOOP, "TC: Setting chart '%s', dimension '%s' name to '%s'", d->st_tokens->id, c->rd_tokens->id, c->name);
505
+ rrddim_set_name(d->st_tokens, c->rd_tokens, c->name);
506
+ }
507
+ }
508
+ }
509
+ rrdset_done(d->st_tokens);
510
+ }
511
+
512
+ // --------------------------------------------------------------------
513
+ // ctokens
514
+
515
+ if(d->enabled_ctokens == CONFIG_ONDEMAND_YES || (d->enabled_ctokens == CONFIG_ONDEMAND_ONDEMAND && ctokens_sum)) {
516
+ d->enabled_ctokens = CONFIG_ONDEMAND_YES;
517
+
518
+ if(unlikely(!d->st_ctokens)) {
519
+ char id[RRD_ID_LENGTH_MAX + 1];
520
+ char name[RRD_ID_LENGTH_MAX + 1];
521
+ snprintfz(id, RRD_ID_LENGTH_MAX, "%s_ctokens", d->id);
522
+ snprintfz(name, RRD_ID_LENGTH_MAX, "%s_ctokens", d->name?d->name:d->id);
523
+
524
+ d->st_ctokens = rrdset_find_bytype(RRD_TYPE_TC, id);
525
+ if(unlikely(!d->st_ctokens)) {
526
+ debug(D_TC_LOOP, "TC: Creating new _ctokens chart for device '%s'", d->name?d->name:d->id);
527
+ d->st_ctokens = rrdset_create(RRD_TYPE_TC, id, name, d->family?d->family:d->id, RRD_TYPE_TC ".qos_ctokens", "Class cTokens", "ctokens", 7040, rrd_update_every, RRDSET_TYPE_LINE);
528
+ }
529
+ }
530
+ else {
531
+ debug(D_TC_LOOP, "TC: Updating _ctokens chart for device '%s'", d->name?d->name:d->id);
532
+ rrdset_next_plugins(d->st_ctokens);
533
+
534
+ // FIXME
535
+ // update the family
536
+ }
537
+
538
+ for(c = d->classes ; c ; c = c->next) {
539
+ if(unlikely(!c->updated)) continue;
540
+
541
+ if(c->isleaf && c->hasparent) {
542
+ if(unlikely(!c->rd_ctokens)) {
543
+ c->rd_ctokens = rrddim_find(d->st_ctokens, c->id);
544
+ if(unlikely(!c->rd_ctokens)) {
545
+ debug(D_TC_LOOP, "TC: Adding to chart '%s', dimension '%s' (name: '%s')", d->st_ctokens->id, c->id, c->name);
546
+
547
+ // new class, we have to add it
548
+ c->rd_ctokens = rrddim_add(d->st_ctokens, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ABSOLUTE);
549
+ }
550
+ else debug(D_TC_LOOP, "TC: Updating chart '%s', dimension '%s'", d->st_ctokens->id, c->id);
551
+ }
552
+
553
+ rrddim_set_by_pointer(d->st_ctokens, c->rd_ctokens, c->ctokens);
554
+
555
+ // if it has a name, different to the id
556
+ if(unlikely(c->name_updated && c->name && strcmp(c->id, c->name) != 0)) {
557
+ // update the rrd dimension with the new name
558
+ debug(D_TC_LOOP, "TC: Setting chart '%s', dimension '%s' name to '%s'", d->st_ctokens->id, c->rd_ctokens->id, c->name);
559
+ rrddim_set_name(d->st_ctokens, c->rd_ctokens, c->name);
560
+ }
561
+ }
562
+ }
563
+ rrdset_done(d->st_ctokens);
564
+ }
565
}
566
567
tc_device_classes_cleanup(d);