mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: use list.h for scheduling run queues

Browse Source
This commit is contained in:
wnstngs
2026-10-07 10:24:50 +03:00
parent 3894be1a15
commit 513faa92c7
4 changed files with 41 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/scheduler.h
+2 -5
View File
@@ -20,15 +20,12 @@
#define SCHED_SLEEP_TIME_LIMIT_CPU_US 1000 #define SCHED_SLEEP_TIME_LIMIT_CPU_US 1000
typedef struct { typedef struct {
struct { list_t queues[SCHED_RUN_QUEUE_SIZE];
thread_t *ins;
thread_t *run;
} queues[SCHED_RUN_QUEUE_SIZE];
bitmap_t thread_bitmap; bitmap_t thread_bitmap;
} sched_run_queue_t; } sched_run_queue_t;
typedef struct { typedef struct {
thread_t *queues[SCHED_RUN_QUEUE_SIZE]; list_t queues[SCHED_RUN_QUEUE_SIZE];
int ins; int ins;
int run; int run;
size_t thread_count; size_t thread_count;
kernel-src/include/kernel/thread.h
+2 -2
View File
@@ -7,6 +7,7 @@
#include <kernel/signal.h> #include <kernel/signal.h>
#include <kernel/event.h> #include <kernel/event.h>
#include <kernel/kcov.h> #include <kernel/kcov.h>
#include <list.h>
#define THREAD_FLAGS_QUEUED 1 #define THREAD_FLAGS_QUEUED 1
#define THREAD_FLAGS_RUNNING 2 #define THREAD_FLAGS_RUNNING 2
@@ -23,8 +24,7 @@ struct proc_t;
typedef struct thread_t { typedef struct thread_t {
void *kernelstacktop; void *kernelstacktop;
struct thread_t *next; list_node_t queue_node;
struct thread_t *prev;
struct thread_t *sleepnext; struct thread_t *sleepnext;
struct thread_t *sleepprev; struct thread_t *sleepprev;
struct thread_t *procnext; struct thread_t *procnext;
kernel-src/sys/scheduler/queue.c
+22 -51
View File
@@ -54,16 +54,7 @@ static cpu_t *pick_cpu(thread_t *thread) {
static void insert_in_run_queue(sched_run_queue_t *run_queue, thread_t *thread) { static void insert_in_run_queue(sched_run_queue_t *run_queue, thread_t *thread) {
int idx = sched_thread_run_queue_index(thread->metrics.interactivity_score); int idx = sched_thread_run_queue_index(thread->metrics.interactivity_score);
thread->prev = run_queue->queues[idx].ins; list_push_back(&run_queue->queues[idx], &thread->queue_node);
if (thread->prev)
thread->prev->next = thread;
else
run_queue->queues[idx].run = thread;
thread->next = NULL;
run_queue->queues[idx].ins = thread;
bitmap_set(&run_queue->thread_bitmap, idx, 1); bitmap_set(&run_queue->thread_bitmap, idx, 1);
} }
@@ -72,14 +63,12 @@ static thread_t *pop_from_run_queue(sched_run_queue_t *run_queue) {
if (idx == -1) if (idx == -1)
return NULL; return NULL;
thread_t *thread = run_queue->queues[idx].run; list_node_t *node = run_queue->queues[idx].next;
thread_t *thread = container_of(node, thread_t, queue_node);
run_queue->queues[idx].run = thread->next; list_remove(node);
if (thread->next) { if (list_is_empty(&run_queue->queues[idx])) {
thread->next->prev = NULL;
} else {
run_queue->queues[idx].ins = NULL;
bitmap_set(&run_queue->thread_bitmap, idx, 0); bitmap_set(&run_queue->thread_bitmap, idx, 0);
} }
@@ -92,22 +81,14 @@ static thread_t *steal_from_calendar_queue(sched_calendar_queue_t *calendar_queu
int run = calendar_queue->run; int run = calendar_queue->run;
thread_t *thread = NULL;
do { do {
thread = calendar_queue->queues[run]; list_for_each (&calendar_queue->queues[run], node) {
thread_t *prev = NULL; thread_t *thread = container_of(node, thread_t, queue_node);
while (thread) {
if (thread->cputarget) { if (thread->cputarget) {
prev = thread;
thread = thread->next;
continue; continue;
} }
if (prev) list_remove(node);
prev->next = thread->next;
else
calendar_queue->queues[run] = thread->next;
--calendar_queue->thread_count; --calendar_queue->thread_count;
return thread; return thread;
} }
@@ -125,26 +106,18 @@ static thread_t *steal_from_run_queue(sched_run_queue_t *run_queue) {
return NULL; return NULL;
for (; idx < SCHED_RUN_QUEUE_SIZE; ++idx) { for (; idx < SCHED_RUN_QUEUE_SIZE; ++idx) {
for (thread_t *search = run_queue->queues[idx].run; search; search = search->next) { list_for_each (&run_queue->queues[idx], node) {
if (search->cputarget) thread_t *thread = container_of(node, thread_t, queue_node);
if (thread->cputarget) {
continue; continue;
if (search->next) {
search->next->prev = search->prev;
} else {
run_queue->queues[idx].ins = search->prev;
} }
if (search->prev) { list_remove(node);
search->prev->next = search->next; if (list_is_empty(&run_queue->queues[idx])) {
} else {
run_queue->queues[idx].run = search->next;
}
if (run_queue->queues[idx].run == NULL)
bitmap_set(&run_queue->thread_bitmap, idx, 0); bitmap_set(&run_queue->thread_bitmap, idx, 0);
}
return search; return thread;
} }
} }
@@ -155,8 +128,7 @@ static thread_t *steal_from_run_queue(sched_run_queue_t *run_queue) {
static void insert_in_calendar_queue(sched_calendar_queue_t *calendar_queue, thread_t *thread) { static void insert_in_calendar_queue(sched_calendar_queue_t *calendar_queue, thread_t *thread) {
int idx = (calendar_queue->ins + thread->metrics.interactivity_score - SCHED_INTERACTIVITY_LIMIT) % SCHED_RUN_QUEUE_SIZE; int idx = (calendar_queue->ins + thread->metrics.interactivity_score - SCHED_INTERACTIVITY_LIMIT) % SCHED_RUN_QUEUE_SIZE;
thread->next = calendar_queue->queues[idx]; list_push_front(&calendar_queue->queues[idx], &thread->queue_node);
calendar_queue->queues[idx] = thread;
++calendar_queue->thread_count; ++calendar_queue->thread_count;
} }
@@ -164,22 +136,21 @@ static thread_t *pop_from_calendar_queue(sched_calendar_queue_t *calendar_queue)
if (calendar_queue->thread_count == 0) if (calendar_queue->thread_count == 0)
return NULL; return NULL;
thread_t *thread; list_node_t *node;
do { do {
thread = calendar_queue->queues[calendar_queue->run]; node = list_pop_front(&calendar_queue->queues[calendar_queue->run]);
if (thread) if (node == NULL) {
calendar_queue->queues[calendar_queue->run] = thread->next;
else
calendar_queue->run = (calendar_queue->run + 1) % SCHED_RUN_QUEUE_SIZE; calendar_queue->run = (calendar_queue->run + 1) % SCHED_RUN_QUEUE_SIZE;
}
if (calendar_queue->run == calendar_queue->ins) if (calendar_queue->run == calendar_queue->ins)
calendar_queue->ins = (calendar_queue->ins + 1) % SCHED_RUN_QUEUE_SIZE; calendar_queue->ins = (calendar_queue->ins + 1) % SCHED_RUN_QUEUE_SIZE;
} while (thread == NULL); } while (node == NULL);
--calendar_queue->thread_count; --calendar_queue->thread_count;
return thread; return container_of(node, thread_t, queue_node);
} }
// requires cpu queue to be locked // requires cpu queue to be locked
kernel-src/sys/scheduler/scheduler.c
+13 -5
View File
@@ -346,9 +346,17 @@ void sched_sleep_us(size_t us) {
sched_yield(); sched_yield();
} }
static void set_up_bitmaps(void) { static void set_up_queues(void) {
__assert(bitmap_init(&current_cpu()->rt_queue.thread_bitmap, SCHED_RUN_QUEUE_SIZE) == 0); cpu_t *cpu = current_cpu();
__assert(bitmap_init(&current_cpu()->idle_queue.thread_bitmap, SCHED_RUN_QUEUE_SIZE) == 0);
for (size_t i = 0; i < SCHED_RUN_QUEUE_SIZE; ++i) {
list_init(&cpu->rt_queue.queues[i]);
list_init(&cpu->idle_queue.queues[i]);
list_init(&cpu->ts_queue.queues[i]);
}
__assert(bitmap_init(&cpu->rt_queue.thread_bitmap, SCHED_RUN_QUEUE_SIZE) == 0);
__assert(bitmap_init(&cpu->idle_queue.thread_bitmap, SCHED_RUN_QUEUE_SIZE) == 0);
} }
void sched_calendar_tick(context_t *, dpcarg_t); void sched_calendar_tick(context_t *, dpcarg_t);
@@ -358,7 +366,7 @@ void sched_ap_entry() {
SPINLOCK_INIT(current_cpu()->sched_lock); SPINLOCK_INIT(current_cpu()->sched_lock);
dpc_prepare(&current_cpu()->reschedule_dpc, sched_reschedule_dpc); dpc_prepare(&current_cpu()->reschedule_dpc, sched_reschedule_dpc);
set_up_bitmaps(); set_up_queues();
current_cpu()->schedulerstack = mm_map(NULL, SCHEDULER_STACK_SIZE, MM_RANGE_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL); current_cpu()->schedulerstack = mm_map(NULL, SCHEDULER_STACK_SIZE, MM_RANGE_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
__assert(current_cpu()->schedulerstack); __assert(current_cpu()->schedulerstack);
@@ -386,7 +394,7 @@ void sched_init() {
SPINLOCK_INIT(sched_idle_cpu_bitmap_lock); SPINLOCK_INIT(sched_idle_cpu_bitmap_lock);
dpc_prepare(&current_cpu()->reschedule_dpc, sched_reschedule_dpc); dpc_prepare(&current_cpu()->reschedule_dpc, sched_reschedule_dpc);
set_up_bitmaps(); set_up_queues();
__assert(bitmap_init(&sched_idle_cpu_bitmap, arch_smp_get_cpu_count()) == 0); __assert(bitmap_init(&sched_idle_cpu_bitmap, arch_smp_get_cpu_count()) == 0);