summaryrefslogtreecommitdiffstats
path: root/collectors
diff options
context:
space:
mode:
authorvkalintiris <vasilis@netdata.cloud>2021-03-10 10:37:47 +0200
committerGitHub <noreply@github.com>2021-03-10 10:37:47 +0200
commitadec24dffa763654bfa8cfa9ae3bd53296c2c24f (patch)
tree63f5307373399ed797e2721fadfa2f83971a61b9 /collectors
parent86ca37683eac5ffd4172c5e62652409087791999 (diff)
Rename struct avl to avl_element and the typedef to avl_t (#10735)
Before: ``` struct foobar { avl avl; ... } ``` After: ``` struct foobar { avl_t avl; ... }; ``` Which makes figuring out the type from field name easier.
Diffstat (limited to 'collectors')
-rw-r--r--collectors/apps.plugin/apps_plugin.c22
-rw-r--r--collectors/ebpf.plugin/ebpf_socket.c4
-rw-r--r--collectors/ebpf.plugin/ebpf_socket.h2
-rw-r--r--collectors/statsd.plugin/statsd.c6
-rw-r--r--collectors/tc.plugin/plugin_tc.c16
5 files changed, 25 insertions, 25 deletions
diff --git a/collectors/apps.plugin/apps_plugin.c b/collectors/apps.plugin/apps_plugin.c
index 7cbbb075c4..4d4626e6b9 100644
--- a/collectors/apps.plugin/apps_plugin.c
+++ b/collectors/apps.plugin/apps_plugin.c
@@ -491,7 +491,7 @@ typedef enum fd_filetype {
} FD_FILETYPE;
struct file_descriptor {
- avl avl;
+ avl_t avl;
#ifdef NETDATA_INTERNAL_CHECKS
uint32_t magic;
@@ -514,7 +514,7 @@ static int
// read users and groups from files
struct user_or_group_id {
- avl avl;
+ avl_t avl;
union {
uid_t uid;
@@ -639,7 +639,7 @@ int read_user_or_group_ids(struct user_or_group_ids *ids, struct timespec *last_
struct user_or_group_id *existing_user_id = NULL;
if(likely(ids->root))
- existing_user_id = (struct user_or_group_id *)avl_search(&ids->index, (avl *) user_or_group_id);
+ existing_user_id = (struct user_or_group_id *)avl_search(&ids->index, (avl_t *) user_or_group_id);
if(unlikely(existing_user_id)) {
freez(existing_user_id->name);
@@ -648,7 +648,7 @@ int read_user_or_group_ids(struct user_or_group_ids *ids, struct timespec *last_
freez(user_or_group_id);
}
else {
- if(unlikely(avl_insert(&ids->index, (avl *) user_or_group_id) != (void *) user_or_group_id)) {
+ if(unlikely(avl_insert(&ids->index, (avl_t *) user_or_group_id) != (void *) user_or_group_id)) {
error("INTERNAL ERROR: duplicate indexing of id during realloc");
};
@@ -664,7 +664,7 @@ int read_user_or_group_ids(struct user_or_group_ids *ids, struct timespec *last_
while(user_or_group_id) {
if(unlikely(!user_or_group_id->updated)) {
- if(unlikely((struct user_or_group_id *)avl_remove(&ids->index, (avl *) user_or_group_id) != user_or_group_id))
+ if(unlikely((struct user_or_group_id *)avl_remove(&ids->index, (avl_t *) user_or_group_id) != user_or_group_id))
error("INTERNAL ERROR: removal of unused id from index, removed a different id");
if(prev_user_id)
@@ -716,7 +716,7 @@ static struct target *get_users_target(uid_t uid) {
int ret = read_user_or_group_ids(&all_user_ids, &last_passwd_modification_time);
if(likely(!ret && all_user_ids.index.root))
- user_or_group_id = (struct user_or_group_id *)avl_search(&all_user_ids.index, (avl *) &user_id_to_find);
+ user_or_group_id = (struct user_or_group_id *)avl_search(&all_user_ids.index, (avl_t *) &user_id_to_find);
}
if(user_or_group_id && user_or_group_id->name && *user_or_group_id->name) {
@@ -764,7 +764,7 @@ struct target *get_groups_target(gid_t gid)
int ret = read_user_or_group_ids(&all_group_ids, &last_group_modification_time);
if(likely(!ret && all_group_ids.index.root))
- group_id = (struct user_or_group_id *)avl_search(&all_group_ids.index, (avl *) &group_id_to_find);
+ group_id = (struct user_or_group_id *)avl_search(&all_group_ids.index, (avl_t *) &group_id_to_find);
}
if(group_id && group_id->name && *group_id->name) {
@@ -1690,7 +1690,7 @@ int file_descriptor_compare(void* a, void* b) {
return strcmp(((struct file_descriptor *)a)->name, ((struct file_descriptor *)b)->name);
}
-// int file_descriptor_iterator(avl *a) { if(a) {}; return 0; }
+// int file_descriptor_iterator(avl_t *a) { if(a) {}; return 0; }
avl_tree_type all_files_index = {
NULL,
@@ -1707,11 +1707,11 @@ static struct file_descriptor *file_descriptor_find(const char *name, uint32_t h
tmp.magic = 0x0BADCAFE;
#endif /* NETDATA_INTERNAL_CHECKS */
- return (struct file_descriptor *)avl_search(&all_files_index, (avl *) &tmp);
+ return (struct file_descriptor *)avl_search(&all_files_index, (avl_t *) &tmp);
}
-#define file_descriptor_add(fd) avl_insert(&all_files_index, (avl *)(fd))
-#define file_descriptor_remove(fd) avl_remove(&all_files_index, (avl *)(fd))
+#define file_descriptor_add(fd) avl_insert(&all_files_index, (avl_t *)(fd))
+#define file_descriptor_remove(fd) avl_remove(&all_files_index, (avl_t *)(fd))
// ----------------------------------------------------------------------------
diff --git a/collectors/ebpf.plugin/ebpf_socket.c b/collectors/ebpf.plugin/ebpf_socket.c
index 9776fb7cdc..0c33416ffa 100644
--- a/collectors/ebpf.plugin/ebpf_socket.c
+++ b/collectors/ebpf.plugin/ebpf_socket.c
@@ -1148,7 +1148,7 @@ static void store_socket_inside_avl(netdata_vector_plot_t *out, netdata_socket_t
memcpy(&test.index, lindex, sizeof(netdata_socket_idx_t));
test.flags = flags;
- ret = (netdata_socket_plot_t *) avl_search_lock(&out->tree, (avl *)&test);
+ ret = (netdata_socket_plot_t *) avl_search_lock(&out->tree, (avl_t *)&test);
if (ret) {
if (lvalues->ct > ret->plot.last_time) {
update_socket_data(&ret->sock, lvalues);
@@ -1186,7 +1186,7 @@ static void store_socket_inside_avl(netdata_vector_plot_t *out, netdata_socket_t
w->flags = flags;
netdata_socket_plot_t *check ;
- check = (netdata_socket_plot_t *) avl_insert_lock(&out->tree, (avl *)w);
+ check = (netdata_socket_plot_t *) avl_insert_lock(&out->tree, (avl_t *)w);
if (check != w)
error("Internal error, cannot insert the AVL tree.");
diff --git a/collectors/ebpf.plugin/ebpf_socket.h b/collectors/ebpf.plugin/ebpf_socket.h
index 1316c003a4..5bd8b2c145 100644
--- a/collectors/ebpf.plugin/ebpf_socket.h
+++ b/collectors/ebpf.plugin/ebpf_socket.h
@@ -232,7 +232,7 @@ typedef struct netdata_socket_idx {
*/
typedef struct netdata_socket_plot {
// Search
- avl avl;
+ avl_t avl;
netdata_socket_idx_t index;
// Current data
diff --git a/collectors/statsd.plugin/statsd.c b/collectors/statsd.plugin/statsd.c
index a8f94130ab..e895857193 100644
--- a/collectors/statsd.plugin/statsd.c
+++ b/collectors/statsd.plugin/statsd.c
@@ -107,7 +107,7 @@ typedef enum statsd_metric_type {
typedef struct statsd_metric {
- avl avl; // indexing - has to be first
+ avl_t avl; // indexing - has to be first
const char *name; // the name of the metric
uint32_t hash; // hash of the name
@@ -376,7 +376,7 @@ static inline STATSD_METRIC *statsd_metric_index_find(STATSD_INDEX *index, const
tmp.name = name;
tmp.hash = (hash)?hash:simple_hash(tmp.name);
- return (STATSD_METRIC *)STATSD_AVL_SEARCH(&index->index, (avl *)&tmp);
+ return (STATSD_METRIC *)STATSD_AVL_SEARCH(&index->index, (avl_t *)&tmp);
}
static inline STATSD_METRIC *statsd_find_or_add_metric(STATSD_INDEX *index, const char *name, STATSD_METRIC_TYPE type) {
@@ -398,7 +398,7 @@ static inline STATSD_METRIC *statsd_find_or_add_metric(STATSD_INDEX *index, cons
m->histogram.ext = callocz(sizeof(STATSD_METRIC_HISTOGRAM_EXTENSIONS), 1);
netdata_mutex_init(&m->histogram.ext->mutex);
}
- STATSD_METRIC *n = (STATSD_METRIC *)STATSD_AVL_INSERT(&index->index, (avl *)m);
+ STATSD_METRIC *n = (STATSD_METRIC *)STATSD_AVL_INSERT(&index->index, (avl_t *)m);
if(unlikely(n != m)) {
freez((void *)m->histogram.ext);
freez((void *)m->name);
diff --git a/collectors/tc.plugin/plugin_tc.c b/collectors/tc.plugin/plugin_tc.c
index b92450efe7..26affee09c 100644
--- a/collectors/tc.plugin/plugin_tc.c
+++ b/collectors/tc.plugin/plugin_tc.c
@@ -12,7 +12,7 @@
#define TC_LINE_MAX 1024
struct tc_class {
- avl avl;
+ avl_t avl;
char *id;
uint32_t hash;
@@ -56,7 +56,7 @@ struct tc_class {
};
struct tc_device {
- avl avl;
+ avl_t avl;
char *id;
uint32_t hash;
@@ -107,15 +107,15 @@ avl_tree_type tc_device_root_index = {
tc_device_compare
};
-#define tc_device_index_add(st) (struct tc_device *)avl_insert(&tc_device_root_index, (avl *)(st))
-#define tc_device_index_del(st) (struct tc_device *)avl_remove(&tc_device_root_index, (avl *)(st))
+#define tc_device_index_add(st) (struct tc_device *)avl_insert(&tc_device_root_index, (avl_t *)(st))
+#define tc_device_index_del(st) (struct tc_device *)avl_remove(&tc_device_root_index, (avl_t *)(st))
static inline struct tc_device *tc_device_index_find(const char *id, uint32_t hash) {
struct tc_device tmp;
tmp.id = (char *)id;
tmp.hash = (hash)?hash:simple_hash(tmp.id);
- return (struct tc_device *)avl_search(&(tc_device_root_index), (avl *)&tmp);
+ return (struct tc_device *)avl_search(&(tc_device_root_index), (avl_t *)&tmp);
}
@@ -128,15 +128,15 @@ static int tc_class_compare(void* a, void* b) {
else return strcmp(((struct tc_class *)a)->id, ((struct tc_class *)b)->id);
}
-#define tc_class_index_add(st, rd) (struct tc_class *)avl_insert(&((st)->classes_index), (avl *)(rd))
-#define tc_class_index_del(st, rd) (struct tc_class *)avl_remove(&((st)->classes_index), (avl *)(rd))
+#define tc_class_index_add(st, rd) (struct tc_class *)avl_insert(&((st)->classes_index), (avl_t *)(rd))
+#define tc_class_index_del(st, rd) (struct tc_class *)avl_remove(&((st)->classes_index), (avl_t *)(rd))
static inline struct tc_class *tc_class_index_find(struct tc_device *st, const char *id, uint32_t hash) {
struct tc_class tmp;
tmp.id = (char *)id;
tmp.hash = (hash)?hash:simple_hash(tmp.id);
- return (struct tc_class *)avl_search(&(st->classes_index), (avl *) &tmp);
+ return (struct tc_class *)avl_search(&(st->classes_index), (avl_t *) &tmp);
}
// ----------------------------------------------------------------------------