wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sched: set kernel_task as current task of bootstrap cpu

Browse Source
This commit is contained in:
max 🍓
2023-03-18 19:35:23 +00:00
parent 57eaf4e01c
commit 4785c767e4
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sched/runqueue.c
View File

@@ -1,4 +1,8 @@
#include <socks/sched.h> #include <socks/sched.h>
#include <socks/percpu.h> #include <socks/percpu.h>
DEFINE_PERCPU_VAR(runqueue_t, rq); void runqueue_init(runqueue_t *rq)
{
memset(rq, 0x00, sizeof *rq);
rq->rq_lock = SPIN_LOCK_INIT;
}

6
sched/sched.c
View File

@@ -1,5 +1,6 @@
#include <socks/object.h> #include <socks/object.h>
#include <socks/sched.h> #include <socks/sched.h>
#include <socks/cpu.h>
#include <socks/printk.h> #include <socks/printk.h>
extern kern_status_t setup_kernel_task(void); extern kern_status_t setup_kernel_task(void);
@@ -25,6 +26,11 @@ kern_status_t sched_init(void)
return status; return status;
} }
cpu_data_t *this_cpu = get_this_cpu();
runqueue_init(&this_cpu->c_rq);
this_cpu->c_current_task = kernel_task();
put_cpu(this_cpu);
printk("sched: initialised"); printk("sched: initialised");
return status; return status;
} }

28
sched/task.c
View File

@@ -1,6 +1,7 @@
#include <socks/locks.h> #include <socks/locks.h>
#include <socks/sched.h> #include <socks/sched.h>
#include <socks/object.h> #include <socks/object.h>
#include <socks/cpu.h>
#include <socks/libc/stdio.h> #include <socks/libc/stdio.h>
static object_type_t task_type = { static object_type_t task_type = {
@@ -8,7 +9,7 @@ static object_type_t task_type = {
.ob_size = sizeof(task_t), .ob_size = sizeof(task_t),
}; };
static task_t *kernel_task; static task_t *__kernel_task;
static spin_lock_t task_list_lock; static spin_lock_t task_list_lock;
static btree_t task_list; static btree_t task_list;
@@ -16,18 +17,23 @@ static btree_t task_list;
BTREE_DEFINE_SIMPLE_GET(task_t, unsigned int, t_tasklist, t_id, task_list_get) BTREE_DEFINE_SIMPLE_GET(task_t, unsigned int, t_tasklist, t_id, task_list_get)
BTREE_DEFINE_SIMPLE_INSERT(task_t, t_tasklist, t_id, task_list_insert) BTREE_DEFINE_SIMPLE_INSERT(task_t, t_tasklist, t_id, task_list_insert)
task_t *kernel_task(void)
{
return __kernel_task;
}
kern_status_t setup_kernel_task(void) kern_status_t setup_kernel_task(void)
{ {
kernel_task = task_alloc(); __kernel_task = task_alloc();
if (!kernel_task) { if (!__kernel_task) {
return KERN_NO_MEMORY; return KERN_NO_MEMORY;
} }
kernel_task->t_id = 0; __kernel_task->t_id = 0;
kernel_task->t_pmap = get_kernel_pmap(); __kernel_task->t_pmap = get_kernel_pmap();
kernel_task->t_state = TASK_RUNNING; __kernel_task->t_state = TASK_RUNNING;
snprintf(kernel_task->t_name, sizeof kernel_task->t_name, "kernel_task"); snprintf(__kernel_task->t_name, sizeof __kernel_task->t_name, "kernel_task");
thread_t *kernel_thread = thread_alloc(); thread_t *kernel_thread = thread_alloc();
kernel_thread->tr_id = 0; kernel_thread->tr_id = 0;
@@ -35,12 +41,12 @@ kern_status_t setup_kernel_task(void)
kernel_thread->tr_state = THREAD_READY; kernel_thread->tr_state = THREAD_READY;
unsigned long flags; unsigned long flags;
task_lock_irqsave(kernel_task, &flags); task_lock_irqsave(__kernel_task, &flags);
queue_push_back(&kernel_task->t_threads, &kernel_thread->tr_threads); queue_push_back(&__kernel_task->t_threads, &kernel_thread->tr_threads);
task_unlock_irqrestore(kernel_task, flags); task_unlock_irqrestore(__kernel_task, flags);
spin_lock_irqsave(&task_list_lock, &flags); spin_lock_irqsave(&task_list_lock, &flags);
task_list_insert(&task_list, kernel_task); task_list_insert(&task_list, __kernel_task);
spin_unlock_irqrestore(&task_list_lock, flags); spin_unlock_irqrestore(&task_list_lock, flags);
return KERN_OK; return KERN_OK;