Changeset c1eaec4 in mainline

Timestamp:

2024-01-19T16:21:20Z (12 months ago)

Author:

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

Branches:

master

Children:

6a0e568

Parents:

25939997

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-19 10:27:42)

git-committer:

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

Message:

Shuffle some locks around

Location:

kernel/generic

Files:

• include/cpu.h (modified) (1 diff)
• src/proc/scheduler.c (modified) (4 diffs)
• src/proc/thread.c (modified) (1 diff)

kernel/generic/include/cpu.h

@@ -76 +76 @@
 
         context_t scheduler_context;
+
+        state_t exiting_state;
 } cpu_local_t;
 

kernel/generic/src/proc/scheduler.c

@@ -361 +361 @@
         /* Save current CPU cycle */
         THREAD->last_cycle = get_cycle();
+
+        irq_spinlock_unlock(&THREAD->lock, false);
 }
 
@@ -440 +442 @@
         }
 
-        /*
-         * Through the 'CURRENT' structure, we keep track of THREAD, TASK, CPU, AS
-         * and preemption counter. At this point CURRENT could be coming either
-         * from THREAD's or CPU's stack.
-         *
-         */
+        irq_spinlock_unlock(&THREAD->lock, false);
+
+        CPU_LOCAL->exiting_state = new_state;
 
         current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
         context_swap(&THREAD->saved_context, &CPU_LOCAL->scheduler_context);
 
-        irq_spinlock_unlock(&THREAD->lock, false);
+        assert(CURRENT->mutex_locks == 0);
+        assert(interrupts_disabled());
+
         interrupts_restore(ipl);
 }
@@ -476 +477 @@
                 int rq_index;
                 THREAD = find_best_thread(&rq_index);
-
                 prepare_to_run_thread(rq_index);
 
@@ -488 +488 @@
                 context_swap(&CPU_LOCAL->scheduler_context, &THREAD->saved_context);
 
-                /* Back from the thread. */
-
+                /* Back from another thread. */
                 assert(CPU != NULL);
                 assert(THREAD != NULL);
-                assert(irq_spinlock_locked(&THREAD->lock));
+                assert(CURRENT->mutex_locks == 0);
                 assert(interrupts_disabled());
 
-                state_t state = THREAD->state;
-                irq_spinlock_unlock(&THREAD->lock, false);
-
-                cleanup_after_thread(THREAD, state);
+                cleanup_after_thread(THREAD, CPU_LOCAL->exiting_state);
 
                 /*

kernel/generic/src/proc/thread.c

@@ -122 +122 @@
 
         /* This is where each thread wakes up after its creation */
-        irq_spinlock_unlock(&THREAD->lock, false);
         interrupts_enable();