#include "rrd.h"
#include "popen.h"
#include "plugin_tc.h"
+#include "main.h"
+#include "../config.h"
#define RRD_TYPE_TC "tc"
#define RRD_TYPE_TC_LEN strlen(RRD_TYPE_TC)
char hasparent;
char isleaf;
unsigned long long bytes;
+ unsigned long long packets;
+ unsigned long long dropped;
+ unsigned long long overlimits;
+ unsigned long long requeues;
+ unsigned long long lended;
+ unsigned long long borrowed;
+ unsigned long long giants;
+ unsigned long long tokens;
+ unsigned long long ctokens;
char updated; // updated bytes
char seen; // seen in the tc list (even without bytes)
avl_tree classes_index;
struct tc_class *classes;
+
+ struct tc_device *next;
+ struct tc_device *prev;
};
+struct tc_device *tc_device_root = NULL;
+
// ----------------------------------------------------------------------------
// tc_device index
avl_tree tc_device_root_index = {
NULL,
- tc_device_compare,
- PTHREAD_RWLOCK_INITIALIZER
+ tc_device_compare
};
#define tc_device_index_add(st) avl_insert(&tc_device_root_index, (avl *)(st))
#define tc_device_index_del(st) avl_remove(&tc_device_root_index, (avl *)(st))
-static struct tc_device *tc_device_index_find(const char *id, uint32_t hash) {
+static inline struct tc_device *tc_device_index_find(const char *id, uint32_t hash) {
struct tc_device *result = NULL, tmp;
tmp.id = (char *)id;
tmp.hash = (hash)?hash:simple_hash(tmp.id);
- avl_search(&(tc_device_root_index), (avl *)&tmp, tc_device_iterator, (avl **)&result);
+ avl_search(&(tc_device_root_index), (avl *) &tmp, tc_device_iterator, (avl **) &result);
return result;
}
#define tc_class_index_add(st, rd) avl_insert(&((st)->classes_index), (avl *)(rd))
#define tc_class_index_del(st, rd) avl_remove(&((st)->classes_index), (avl *)(rd))
-static struct tc_class *tc_class_index_find(struct tc_device *st, const char *id, uint32_t hash) {
+static inline struct tc_class *tc_class_index_find(struct tc_device *st, const char *id, uint32_t hash) {
struct tc_class *result = NULL, tmp;
tmp.id = (char *)id;
tmp.hash = (hash)?hash:simple_hash(tmp.id);
- avl_search(&(st->classes_index), (avl *)&tmp, tc_class_iterator, (avl **)&result);
+ avl_search(&(st->classes_index), (avl *) &tmp, tc_class_iterator, (avl **) &result);
return result;
}
// ----------------------------------------------------------------------------
-static void tc_class_free(struct tc_device *n, struct tc_class *c) {
+static inline void tc_class_free(struct tc_device *n, struct tc_class *c) {
debug(D_TC_LOOP, "Removing from device '%s' class '%s', parentid '%s', leafid '%s', seen=%d", n->id, c->id, c->parentid?c->parentid:"", c->leafid?c->leafid:"", c->seen);
if(c->next) c->next->prev = c->prev;
if(c->prev) c->prev->next = c->next;
- if(n->classes == c) n->classes = c->next;
+ if(n->classes == c) {
+ if(c->next) n->classes = c->next;
+ else n->classes = c->prev;
+ }
tc_class_index_del(n, c);
free(c);
}
-static void tc_device_classes_cleanup(struct tc_device *d) {
+static inline void tc_device_classes_cleanup(struct tc_device *d) {
static int cleanup_every = 999;
if(cleanup_every > 0) {
- cleanup_every = -config_get_number("plugin:tc", "cleanup unused classes every", 60);
+ cleanup_every = (int) -config_get_number("plugin:tc", "cleanup unused classes every", 60);
if(cleanup_every > 0) cleanup_every = -cleanup_every;
if(cleanup_every == 0) cleanup_every = -1;
}
}
}
-static void tc_device_commit(struct tc_device *d)
+static inline void tc_device_commit(struct tc_device *d)
{
static int enable_new_interfaces = -1;
if(!st) {
debug(D_TC_LOOP, "TC: Creating new chart for device '%s'", d->name?d->name:d->id);
- st = rrdset_create(RRD_TYPE_TC, d->id, d->name?d->name:d->id, d->family?d->family:d->id, "Class Usage", "kilobits/s", 1000, rrd_update_every, RRDSET_TYPE_STACKED);
+ st = rrdset_create(RRD_TYPE_TC, d->id, d->name?d->name:d->id, d->family?d->family:d->id, RRD_TYPE_TC ".qos", "Class Usage", "kilobits/s", 7000, rrd_update_every, RRDSET_TYPE_STACKED);
for(c = d->classes ; c ; c = c->next) {
if(!c->updated) continue;
tc_device_classes_cleanup(d);
}
-static void tc_device_set_class_name(struct tc_device *d, char *id, char *name)
+static inline void tc_device_set_class_name(struct tc_device *d, char *id, char *name)
{
struct tc_class *c = tc_class_index_find(d, id, 0);
if(c) {
}
}
-static void tc_device_set_device_name(struct tc_device *d, char *name) {
+static inline void tc_device_set_device_name(struct tc_device *d, char *name) {
if(d->name) free(d->name);
d->name = NULL;
}
}
-static void tc_device_set_device_family(struct tc_device *d, char *family) {
+static inline void tc_device_set_device_family(struct tc_device *d, char *family) {
if(d->family) free(d->family);
d->family = NULL;
// no need for null termination - it is already null
}
-static struct tc_device *tc_device_create(char *id)
+static inline struct tc_device *tc_device_create(char *id)
{
struct tc_device *d = tc_device_index_find(id, 0);
d->id = strdup(id);
d->hash = simple_hash(d->id);
- d->classes_index.root = NULL;
- d->classes_index.compar = tc_class_compare;
- pthread_rwlock_init(&d->classes_index.rwlock, NULL);
-
+ avl_init(&d->classes_index, tc_class_compare);
tc_device_index_add(d);
+
+ if(!tc_device_root) {
+ tc_device_root = d;
+ }
+ else {
+ d->next = tc_device_root;
+ tc_device_root->prev = d;
+ tc_device_root = d;
+ }
}
return(d);
}
-static struct tc_class *tc_class_add(struct tc_device *n, char *id, char *parentid, char *leafid)
+static inline struct tc_class *tc_class_add(struct tc_device *n, char *id, char *parentid, char *leafid)
{
struct tc_class *c = tc_class_index_find(n, id, 0);
return(c);
}
-/*
-static void tc_device_free(struct tc_device *n)
+
+static inline void tc_device_free(struct tc_device *n)
{
+ if(n->next) n->next->prev = n->prev;
+ if(n->prev) n->prev->next = n->next;
+ if(tc_device_root == n) {
+ if(n->next) tc_device_root = n->next;
+ else tc_device_root = n->prev;
+ }
+
tc_device_index_del(n);
while(n->classes) tc_class_free(n, n->classes);
free(n);
}
-*/
+
+static inline void tc_device_free_all()
+{
+ while(tc_device_root)
+ tc_device_free(tc_device_root);
+}
#define MAX_WORDS 20
}
}
-static void tc_split_words(char *str, char **words, int max_words) {
+static inline void tc_split_words(char *str, char **words, int max_words) {
char *s = str;
int i = 0;
uint32_t END_HASH = simple_hash("END");
uint32_t CLASS_HASH = simple_hash("class");
uint32_t SENT_HASH = simple_hash("Sent");
+ uint32_t LENDED_HASH = simple_hash("lended:");
+ uint32_t TOKENS_HASH = simple_hash("tokens:");
uint32_t SETDEVICENAME_HASH = simple_hash("SETDEVICENAME");
uint32_t SETDEVICEGROUP_HASH = simple_hash("SETDEVICEGROUP");
uint32_t SETCLASSNAME_HASH = simple_hash("SETCLASSNAME");
uint32_t first_hash;
for(;1;) {
+ if(unlikely(netdata_exit)) break;
+
FILE *fp;
struct tc_device *device = NULL;
struct tc_class *class = NULL;
fp = mypopen(buffer, &tc_child_pid);
if(!fp) {
error("TC: Cannot popen(\"%s\", \"r\").", buffer);
+ pthread_exit(NULL);
return NULL;
}
while(fgets(buffer, TC_LINE_MAX, fp) != NULL) {
+ if(unlikely(netdata_exit)) break;
+
buffer[TC_LINE_MAX] = '\0';
// debug(D_TC_LOOP, "TC: read '%s'", buffer);
first_hash = simple_hash(words[0]);
- if(first_hash == CLASS_HASH && strcmp(words[0], "class") == 0 && device) {
+ if(device && first_hash == CLASS_HASH && strcmp(words[0], "class") == 0) {
// debug(D_TC_LOOP, "CLASS line on class id='%s', parent='%s', parentid='%s', leaf='%s', leafid='%s'", words[2], words[3], words[4], words[5], words[6]);
- if(words[1] && words[2] && words[3] && words[4] && (strcmp(words[3], "parent") == 0 || strcmp(words[3], "root") == 0)) {
- // char *type = words[1]; // the class: htb, fq_codel, etc
+ // clear the last class
+ class = NULL;
+
+ // words[1] : class type
+ // words[2] : N:XX
+ // words[3] : parent or root
+ if(words[1] && words[2] && words[3] && (strcmp(words[3], "parent") == 0 || strcmp(words[3], "root") == 0)) {
+ //char *type = words[1]; // the class: htb, fq_codel, etc
+
+ // we are only interested for HTB classes
+ //if(strcmp(type, "htb") != 0) continue;
+
char *id = words[2]; // the class major:minor
char *parent = words[3]; // 'parent' or 'root'
char *parentid = words[4]; // the parent's id
class = NULL;
}
}
- else if(first_hash == SENT_HASH && strcmp(words[0], "Sent") == 0 && device && class) {
+ else if(device && class && first_hash == SENT_HASH && strcmp(words[0], "Sent") == 0) {
// debug(D_TC_LOOP, "SENT line '%s'", words[1]);
if(words[1] && *words[1]) {
- class->bytes = atoll(words[1]);
+ class->bytes = strtoull(words[1], NULL, 10);
class->updated = 1;
}
- else class->bytes = 0;
+
+ if(words[3] && *words[3])
+ class->packets = strtoull(words[3], NULL, 10);
+
+ if(words[6] && *words[6])
+ class->dropped = strtoull(words[6], NULL, 10);
+
+ if(words[8] && *words[8])
+ class->overlimits = strtoull(words[8], NULL, 10);
+
+ if(words[10] && *words[10])
+ class->requeues = strtoull(words[8], NULL, 10);
+ }
+ else if(device && class && class->updated && first_hash == LENDED_HASH && strcmp(words[0], "lended:") == 0) {
+ // debug(D_TC_LOOP, "LENDED line '%s'", words[1]);
+ if(words[1] && *words[1])
+ class->lended = strtoull(words[1], NULL, 10);
+
+ if(words[3] && *words[3])
+ class->borrowed = strtoull(words[3], NULL, 10);
+
+ if(words[5] && *words[5])
+ class->giants = strtoull(words[5], NULL, 10);
+ }
+ else if(device && class && class->updated && first_hash == TOKENS_HASH && strcmp(words[0], "tokens:") == 0) {
+ // debug(D_TC_LOOP, "TOKENS line '%s'", words[1]);
+ if(words[1] && *words[1])
+ class->tokens = strtoull(words[1], NULL, 10);
+
+ if(words[3] && *words[3])
+ class->ctokens = strtoull(words[3], NULL, 10);
}
- else if(first_hash == SETDEVICENAME_HASH && strcmp(words[0], "SETDEVICENAME") == 0 && device) {
+ else if(device && first_hash == SETDEVICENAME_HASH && strcmp(words[0], "SETDEVICENAME") == 0) {
// debug(D_TC_LOOP, "SETDEVICENAME line '%s'", words[1]);
if(words[1] && *words[1]) tc_device_set_device_name(device, words[1]);
}
- else if(first_hash == SETDEVICEGROUP_HASH && strcmp(words[0], "SETDEVICEGROUP") == 0 && device) {
+ else if(device && first_hash == SETDEVICEGROUP_HASH && strcmp(words[0], "SETDEVICEGROUP") == 0) {
// debug(D_TC_LOOP, "SETDEVICEGROUP line '%s'", words[1]);
if(words[1] && *words[1]) tc_device_set_device_family(device, words[1]);
}
- else if(first_hash == SETCLASSNAME_HASH && strcmp(words[0], "SETCLASSNAME") == 0 && device) {
+ else if(device && first_hash == SETCLASSNAME_HASH && strcmp(words[0], "SETCLASSNAME") == 0) {
// debug(D_TC_LOOP, "SETCLASSNAME line '%s' '%s'", words[1], words[2]);
char *id = words[1];
char *path = words[2];
if(!stcpu) stcpu = rrdset_find("netdata.plugin_tc_cpu");
if(!stcpu) {
- stcpu = rrdset_create("netdata", "plugin_tc_cpu", NULL, "netdata", "NetData TC CPU usage", "milliseconds/s", 10000, rrd_update_every, RRDSET_TYPE_STACKED);
+ stcpu = rrdset_create("netdata", "plugin_tc_cpu", NULL, "tc.helper", NULL, "NetData TC CPU usage", "milliseconds/s", 135000, rrd_update_every, RRDSET_TYPE_STACKED);
rrddim_add(stcpu, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
rrddim_add(stcpu, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
}
if(!sttime) stcpu = rrdset_find("netdata.plugin_tc_time");
if(!sttime) {
- sttime = rrdset_create("netdata", "plugin_tc_time", NULL, "netdata", "NetData TC script execution", "milliseconds/run", 10001, rrd_update_every, RRDSET_TYPE_AREA);
+ sttime = rrdset_create("netdata", "plugin_tc_time", NULL, "tc.helper", NULL, "NetData TC script execution", "milliseconds/run", 135001, rrd_update_every, RRDSET_TYPE_AREA);
rrddim_add(sttime, "run_time", "run time", 1, 1, RRDDIM_ABSOLUTE);
}
else rrdset_next(sttime);
// debug(D_TC_LOOP, "IGNORED line");
//}
}
- mypclose(fp, tc_child_pid);
+ // fgets() failed or loop broke
+ int code = mypclose(fp, tc_child_pid);
tc_child_pid = 0;
if(device) {
class = NULL;
}
- sleep(rrd_update_every);
+ if(netdata_exit) {
+ tc_device_free_all();
+ pthread_exit(NULL);
+ return NULL;
+ }
+
+ if(code == 1 || code == 127) {
+ // 1 = DISABLE
+ // 127 = cannot even run it
+ error("TC: tc-qos-helper.sh exited with code %d. Disabling it.", code);
+
+ tc_device_free_all();
+ pthread_exit(NULL);
+ return NULL;
+ }
+
+ sleep((unsigned int) rrd_update_every);
}
+ pthread_exit(NULL);
return NULL;
}
-