Skip to content

Commit

Permalink
fix thread name on fatal and cgroup netdev rename crash (#16771)
Browse files Browse the repository at this point in the history
* fix thread name on fatal

* fix cgroup missing reference counter dup

(cherry picked from commit cac1e1f)
  • Loading branch information
ktsaou authored and tkatsoulas committed Feb 6, 2024
1 parent eb56dee commit 2e10ab7
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions collectors/cgroups.plugin/cgroup-top.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ void cgroup_netdev_link_init(void) {
}

const DICTIONARY_ITEM *cgroup_netdev_get(struct cgroup *cg) {
if(cg->cgroup_netdev_link)
return cg->cgroup_netdev_link;


struct cgroup_netdev_link t = {
if(!cg->cgroup_netdev_link) {
struct cgroup_netdev_link t = {
.read_slot = 0,
.received = { NAN, NAN },
.sent = { NAN, NAN },
};
.received = {NAN, NAN},
.sent = {NAN, NAN},
};

cg->cgroup_netdev_link =
dictionary_set_and_acquire_item(cgroup_netdev_link_dict, cg->id, &t, sizeof(struct cgroup_netdev_link));
}

cg->cgroup_netdev_link = dictionary_set_and_acquire_item(cgroup_netdev_link_dict, cg->id, &t, sizeof(struct cgroup_netdev_link));
return dictionary_acquired_item_dup(cgroup_netdev_link_dict, cg->cgroup_netdev_link);
}

Expand All @@ -34,6 +34,7 @@ void cgroup_netdev_delete(struct cgroup *cg) {
dictionary_acquired_item_release(cgroup_netdev_link_dict, cg->cgroup_netdev_link);
dictionary_del(cgroup_netdev_link_dict, cg->id);
dictionary_garbage_collect(cgroup_netdev_link_dict);
cg->cgroup_netdev_link = NULL;
}
}

Expand Down

0 comments on commit 2e10ab7

Please sign in to comment.