apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Add a state to Thread

Browse Source
This commit is contained in:
apio 2022-12-07 15:14:58 +01:00
parent 48fe2d4b04
commit 021ea1063b
Signed by: apio
GPG Key ID: B8A7D06E42258954
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/arch/x86_64/Thread.cpp
View File

@ -43,7 +43,7 @@ void Thread::set_arguments(u64 arg1, u64 arg2, u64 arg3, u64 arg4)
void switch_context(Thread* old_thread, Thread* new_thread, Registers* regs) void switch_context(Thread* old_thread, Thread* new_thread, Registers* regs)
{ {
if (!old_thread->is_idle) memcpy(&old_thread->regs, regs, sizeof(Registers)); if (!old_thread->is_idle()) memcpy(&old_thread->regs, regs, sizeof(Registers));
memcpy(regs, &new_thread->regs, sizeof(Registers)); memcpy(regs, &new_thread->regs, sizeof(Registers));
} }

6
kernel/src/thread/Scheduler.cpp
View File

@ -18,7 +18,7 @@ namespace Scheduler
g_idle.id = 0; g_idle.id = 0;
g_idle.init_regs_kernel(); g_idle.init_regs_kernel();
g_idle.set_ip((u64)CPU::idle_loop); g_idle.set_ip((u64)CPU::idle_loop);
g_idle.is_idle = true; g_idle.state = ThreadState::Idle;
g_idle.ticks_left = 1; g_idle.ticks_left = 1;
@ -86,7 +86,7 @@ namespace Scheduler
Thread* pick_task() Thread* pick_task()
{ {
Thread* old = g_current; Thread* old = g_current;
if (old->is_idle) if (old->is_idle())
{ {
auto maybe_first = g_threads.last(); auto maybe_first = g_threads.last();
if (maybe_first.has_error()) // No threads!! if (maybe_first.has_error()) // No threads!!
@ -111,7 +111,7 @@ namespace Scheduler
{ {
if (old_thread != new_thread) switch_context(old_thread, new_thread, regs); if (old_thread != new_thread) switch_context(old_thread, new_thread, regs);
if (new_thread->is_idle) if (new_thread->is_idle())
{ {
new_thread->ticks_left = 1; // The idle task only runs for 1 tick so we can check for new runnable tasks new_thread->ticks_left = 1; // The idle task only runs for 1 tick so we can check for new runnable tasks
// as fast as possible. // as fast as possible.

14
kernel/src/thread/Thread.h
View File

@ -10,6 +10,13 @@
#error "Unknown architecture." #error "Unknown architecture."
#endif #endif
enum class ThreadState
{
Idle,
Runnable,
Sleeping
};
struct Thread : public DoublyLinkedListNode<Thread> struct Thread : public DoublyLinkedListNode<Thread>
{ {
Registers regs; Registers regs;
@ -22,7 +29,12 @@ struct Thread : public DoublyLinkedListNode<Thread>
u64 ticks_left; u64 ticks_left;
bool is_idle = false; ThreadState state = ThreadState::Runnable;
bool is_idle()
{
return state == ThreadState::Idle;
}
void init_regs_kernel(); void init_regs_kernel();
void init_regs_user(); void init_regs_user();