kamkow1/mop3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make proc->state not atomic

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-02-22 14:15:57 +01:00
parent e69606668d
commit 1b2063115a
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/proc/proc.c
View File

@@ -233,7 +233,11 @@ static struct proc* proc_find_sched (struct cpu* cpu) {
do {
struct proc* proc = list_entry (current, struct proc, cpu_run_q_link);
if (atomic_load (&proc->state) == PROC_READY)
spin_lock (&proc->lock);
int state = proc->state;
spin_unlock (&proc->lock);
if (state == PROC_READY)
return proc;
current = current->next ? current->next : cpu->proc_run_q;
@@ -256,13 +260,16 @@ static void proc_reap (struct reschedule_ctx* rctx) {
rbtree_next (node, next);
proc = rbtree_entry (node, struct proc, proc_tree_link);
if (atomic_load (&proc->state) == PROC_DEAD) {
spin_lock (&proc->lock);
node = next;
spin_lock (&proc->lock);
if (proc->state == PROC_DEAD) {
list_append (reap_list, &proc->reap_link);
spin_unlock (&proc->lock);
rbtree_delete (&proc_tree, &proc->proc_tree_link);
}
node = next;
spin_unlock (&proc->lock);
}
spin_unlock (&proc_tree_lock);
@@ -270,8 +277,9 @@ static void proc_reap (struct reschedule_ctx* rctx) {
struct list_node_link *reap_link, *reap_link_tmp;
list_foreach (reap_list, reap_link, reap_link_tmp) {
proc = list_entry (reap_link, struct proc, reap_link);
rbtree_delete (&proc_tree, &proc->proc_tree_link);
list_remove (reap_list, &proc->reap_link);
DEBUG ("cleanup PID %d\n", proc->pid);
proc_cleanup (proc, rctx);
}
@@ -311,7 +319,7 @@ void proc_kill (struct proc* proc, struct reschedule_ctx* rctx) {
spin_lock (&cpu->lock);
spin_lock (&proc->lock);
atomic_store (&proc->state, PROC_DEAD);
proc->state = PROC_DEAD;
proc->cpu = NULL;
list_remove (cpu->proc_run_q, &proc->cpu_run_q_link);