stepus53/ficus
1
0
Fork 0
mirror of https://github.com/usatiuk/ficus.git synced 2025-10-29 08:37:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

pretty up task switching a bit

Browse Source
This commit is contained in:
Stepan Usatiuk
2023-10-22 10:25:28 +02:00
parent db54cbf259
commit b94a46cd20
7 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/arch/x86/task.cpp
View File

@@ -226,9 +226,25 @@ void yield_self() {
extern "C" void switch_task(struct task_frame *cur_frame) {
assert2(!are_interrupts_enabled(), "Switching tasks with enabled interrupts!");
if (!atomic_load(&initialized)) return;
sanity_check_frame(cur_frame);
struct TaskListNode *node = WaitingTasks.cur;
while (node) {
if (node->task->sleep_until <= micros && node->task->state == TS_TO_SLEEP) {
assert2(node->task->sleep_until, "Sleeping until 0?");
node->task->sleep_until = 0;
node->task->state = TS_RUNNING;
append_task_node(&NextTasks, pop_front_node(&WaitingTasks));
node = WaitingTasks.cur;
} else {
break;
}
}
assert2(!are_interrupts_enabled(), "Switching tasks with enabled interrupts!");
if (RunningTask) {
@@ -303,25 +319,6 @@ extern "C" void switch_task(struct task_frame *cur_frame) {
sanity_check_frame(cur_frame);
}
void switch_task_int(struct task_frame *cur_frame) {
assert2(!are_interrupts_enabled(), "Switching tasks with enabled interrupts!");
struct TaskListNode *node = WaitingTasks.cur;
while (node) {
if (node->task->sleep_until <= micros && node->task->state == TS_TO_SLEEP) {
assert2(node->task->sleep_until, "Sleeping until 0?");
node->task->sleep_until = 0;
node->task->state = TS_RUNNING;
append_task_node(&NextTasks, pop_front_node(&WaitingTasks));
node = WaitingTasks.cur;
} else {
break;
}
}
switch_task(cur_frame);
}
void wait_m_on_self(struct Mutex *m) {
if (!m->waiters) {
m->waiters = static_cast<TaskList *>(kmalloc(sizeof(struct TaskList)));