Merge pull request #579 from mihalicyn/cpuview_deadlock

cpuview: fix ABBA deadlock in find_proc_stat_node
lxc · Jan 16, 2023 · cd2e3ac · cd2e3ac
2 parents 0f7fe14 + 1e8d209
commit cd2e3ac
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/proc_cpuview.c b/src/proc_cpuview.c
@@ -307,6 +307,7 @@ static struct cg_proc_stat *find_proc_stat_node(struct cg_proc_stat_head *head,
 {
 	struct cg_proc_stat *node;
 
+	prune_proc_stat_history();
 	pthread_rwlock_rdlock(&head->lock);
 
 	if (!head->next) {
@@ -327,7 +328,6 @@ static struct cg_proc_stat *find_proc_stat_node(struct cg_proc_stat_head *head,
 
 out:
 	pthread_rwlock_unlock(&head->lock);
-	prune_proc_stat_history();
 	return node;
 }