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

scheduler: don't use the state THREAD_STATE_WAITING anymore

Browse Source
This commit is contained in:
Matheus
2022-09-17 21:53:09 -03:00
parent e3f827896c
commit 4bc9a3788f
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/sched/scheduler.c
+8 -11
View File
@@ -194,8 +194,6 @@ void sched_timerhook(arch_regs* regs){
arch_setkernelstack(next->kernelstack); arch_setkernelstack(next->kernelstack);
arch_regs_setupextra(&next->extraregs); arch_regs_setupextra(&next->extraregs);
next->state = THREAD_STATE_RUNNING;
timer_add(&arch_getcls()->schedreq, THREAD_QUANTUM, false); timer_add(&arch_getcls()->schedreq, THREAD_QUANTUM, false);
@@ -227,7 +225,7 @@ void switch_thread(thread_t* thread){
thread_t* sched_newuthread(void* ip, size_t kstacksize, void* stack, proc_t* proc, bool run, int prio){ thread_t* sched_newuthread(void* ip, size_t kstacksize, void* stack, proc_t* proc, bool run, int prio){
thread_t* thread = allocthread(NULL, THREAD_STATE_WAITING, 0, kstacksize); thread_t* thread = allocthread(NULL, THREAD_STATE_RUNNING, 0, kstacksize);
if(!proc){ if(!proc){
proc = allocproc(1); proc = allocproc(1);
@@ -262,7 +260,7 @@ thread_t* sched_newuthread(void* ip, size_t kstacksize, void* stack, proc_t* pro
} }
thread_t* sched_newkthread(void* ip, size_t stacksize, bool run, int prio){ thread_t* sched_newkthread(void* ip, size_t stacksize, bool run, int prio){
thread_t* thread = allocthread(NULL, THREAD_STATE_WAITING, 0, stacksize); thread_t* thread = allocthread(NULL, THREAD_STATE_RUNNING, 0, stacksize);
if(!thread) return NULL; if(!thread) return NULL;
@@ -288,17 +286,16 @@ void sched_yieldtrampoline(thread_t* thread){
spinlock_acquire(&queues[thread->priority].lock); spinlock_acquire(&queues[thread->priority].lock);
queue_add(&queues[thread->priority], thread); queue_add(&queues[thread->priority], thread);
spinlock_release(&queues[thread->priority].lock); spinlock_release(&queues[thread->priority].lock);
thread->state = THREAD_STATE_WAITING;
} }
thread = getnext(); thread_t* nthread = getnext();
thread->state = THREAD_STATE_RUNNING; nthread->state = THREAD_STATE_RUNNING;
timer_resume(); timer_resume();
switch_thread(thread); switch_thread(nthread);
} }
@@ -317,14 +314,14 @@ void sched_yield(){
} }
void sched_eventsignal(event_t* event, thread_t* thread){ void sched_eventsignal(event_t* event, thread_t* thread){
if(thread->state != THREAD_STATE_BLOCKED && thread->state != THREAD_STATE_BLOCKED_INTR) if(thread->state != THREAD_STATE_BLOCKED && thread->state != THREAD_STATE_BLOCKED_INTR)
return; return;
if(thread->state == THREAD_STATE_BLOCKED_INTR && event == &thread->sigevent) if(thread->state == THREAD_STATE_BLOCKED_INTR && event == &thread->sigevent)
return; return;
thread->state = THREAD_STATE_WAITING; thread->state = THREAD_STATE_RUNNING;
thread->awokenby = event; thread->awokenby = event;
spinlock_acquire(&queues[thread->priority].lock); spinlock_acquire(&queues[thread->priority].lock);