Changeset 41bfc64 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2024-01-20T17:24:56Z (4 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

7364e2d1

Parents:

3d84734

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-20 16:23:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-20 17:24:56)

Message:

Make thread→state weakly atomic so we don't need to hold thread lock

File:

• kernel/generic/src/proc/scheduler.c (modified) (7 diffs)

kernel/generic/src/proc/scheduler.c

@@ -313 +313 @@
         assert(atomic_get_unordered(&THREAD->cpu) == CPU);
 
-        THREAD->state = Running;
+        atomic_set_unordered(&THREAD->state, Running);
         atomic_set_unordered(&THREAD->priority, rq_index);  /* Correct rq index */
 
@@ -386 +386 @@
         irq_spinlock_lock(&thread->lock, false);
 
-        assert(thread->state == Running);
+        assert(atomic_get_unordered(&thread->state) == Running);
         assert(atomic_get_unordered(&thread->cpu) == CPU);
 
@@ -396 +396 @@
         }
 
-        thread->state = Ready;
+        atomic_set_unordered(&thread->state, Ready);
 
         irq_spinlock_unlock(&thread->lock, false);
@@ -409 +409 @@
         irq_spinlock_lock(&thread->lock, false);
 
-        assert(thread->state == Sleeping || thread->state == Entering);
+        assert(atomic_get_unordered(&thread->state) == Sleeping || atomic_get_unordered(&thread->state) == Entering);
 
         atomic_set_unordered(&thread->priority, 0);
-        thread->state = Ready;
+        atomic_set_unordered(&thread->state, Ready);
 
         /* Prefer the CPU on which the thread ran last */
@@ -471 +471 @@
                  */
                 panic("tid%" PRIu64 ": unexpected state %s.",
-                    thread->tid, thread_states[thread->state]);
+                    thread->tid, thread_states[out_state]);
                 break;
         }
@@ -501 +501 @@
 
         irq_spinlock_lock(&THREAD->lock, false);
-        THREAD->state = new_state;
+
+        atomic_set_unordered(&THREAD->state, new_state);
 
         /* Update thread kernel accounting */
@@ -809 +810 @@
                             thread) {
                                 printf("%" PRIu64 "(%s) ", thread->tid,
-                                    thread_states[thread->state]);
+                                    thread_states[atomic_get_unordered(&thread->state)]);
                         }
                         printf("\n");