Changeset 286da52 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2024-01-20T15:56:45Z (4 months ago)

Author:

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

Branches:

master

Children:

efed95a3

Parents:

6a0e568

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-03-27 17:37:59)

git-committer:

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

Message:

Streamline requeuing threads

Split thread_ready() into different functions for different circumstances,
since they can be simplified after.

File:

• kernel/generic/src/proc/thread.c (modified) (3 diffs)

kernel/generic/src/proc/thread.c

@@ -210 +210 @@
 {
         assert(thread->state == Entering);
-        thread_ready(thread_ref(thread));
-}
-
-/** Make thread ready
- *
- * Switch thread to the ready state. Consumes reference passed by the caller.
- *
- * @param thread Thread to make ready.
- *
- */
-void thread_ready(thread_t *thread)
-{
-        // TODO: move this to scheduler.c
-        irq_spinlock_lock(&thread->lock, true);
-
-        assert(thread->state != Ready);
-
-        int i = (thread->priority < RQ_COUNT - 1) ?
-            ++thread->priority : thread->priority;
-
-        /* Prefer the CPU on which the thread ran last */
-        cpu_t *cpu = thread->cpu ? thread->cpu : CPU;
-
-        thread->state = Ready;
-
-        irq_spinlock_pass(&thread->lock, &(cpu->rq[i].lock));
-
-        /*
-         * Append thread to respective ready queue
-         * on respective processor.
-         */
-
-        list_append(&thread->rq_link, &cpu->rq[i].rq);
-        cpu->rq[i].n++;
-        irq_spinlock_unlock(&(cpu->rq[i].lock), true);
-
-        atomic_inc(&nrdy);
-        atomic_inc(&cpu->nrdy);
+        thread_requeue_sleeping(thread_ref(thread));
 }
 
@@ -613 +576 @@
                  * the waking thread by the sleeper in thread_wait_finish().
                  */
-                thread_ready(thread);
+                thread_requeue_sleeping(thread);
         }
 }
@@ -1064 +1027 @@
                 thread_attach(thread, TASK);
 #endif
-                thread_ready(thread);
+                thread_start(thread);
+                thread_put(thread);
 
                 return 0;