enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-07-01 18:39:16 +00:00
Code Issues Actions Releases Wiki Activity

refactor(kernel): ♻️ rewrite time manager

Browse Source
This commit is contained in:
EnderIce2
2025-05-23 23:30:04 +00:00
parent 9538589c11
commit 33c284091d
31 changed files with 572 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kernel/tasking/process.cpp
View File

@ -251,7 +251,7 @@ namespace Tasking
this->AllocatedMemory += sizeof(Memory::ProgramBreak);
this->AllocatedMemory += sizeof(SymbolResolver::Symbols);
this->Info.SpawnTime = TimeManager->GetCounter();
this->Info.SpawnTime = TimeManager->GetTimeNs();
if (Parent)
Parent->Children.push_back(this);

20
Kernel/tasking/scheduler/custom.cpp
View File

@ -290,7 +290,7 @@ namespace Tasking::Scheduler
hot nsa void Custom::UpdateUsage(TaskInfo *Info, TaskExecutionMode Mode, int Core)
{
UNUSED(Core);
uint64_t CurrentTime = TimeManager->GetCounter();
uint64_t CurrentTime = TimeManager->GetTimeNs();
uint64_t TimePassed = Info->LastUpdateTime - CurrentTime;
Info->LastUpdateTime = CurrentTime;
@ -529,7 +529,7 @@ namespace Tasking::Scheduler
continue;
/* Check if the thread is ready to wake up. */
if (unlikely(thread->Info.SleepUntil < TimeManager->GetCounter()))
if (unlikely(thread->Info.SleepUntil < TimeManager->GetTimeNs()))
{
if (pState == TaskState::Sleeping)
process->State.store(TaskState::Ready);
@ -541,7 +541,7 @@ namespace Tasking::Scheduler
else
{
wut_schedbg("Thread \"%s\"(%d) is not ready to wake up. (SleepUntil: %d, Counter: %d)",
thread->Name, thread->ID, thread->Info.SleepUntil, TimeManager->GetCounter());
thread->Name, thread->ID, thread->Info.SleepUntil, TimeManager->GetTimeNs());
}
}
}
@ -574,7 +574,7 @@ namespace Tasking::Scheduler
return;
}
bool ProcessNotChanged = false;
uint64_t SchedTmpTicks = TimeManager->GetCounter();
uint64_t SchedTmpTicks = TimeManager->GetTimeNs();
this->LastTaskTicks.store(size_t(SchedTmpTicks - this->SchedulerTicks.load()));
CPUData *CurrentCPU = GetCurrentCPU();
this->LastCore.store(CurrentCPU->ID);
@ -621,7 +621,7 @@ namespace Tasking::Scheduler
CurrentCPU->CurrentProcess->State.store(TaskState::Running);
CurrentCPU->CurrentThread->State.store(TaskState::Running);
*Frame = CurrentCPU->CurrentThread->Registers;
this->SchedulerTicks.store(size_t(TimeManager->GetCounter() - SchedTmpTicks));
this->SchedulerTicks.store(size_t(TimeManager->GetTimeNs() - SchedTmpTicks));
return;
}
@ -696,8 +696,8 @@ namespace Tasking::Scheduler
CurrentCPU->CurrentProcess->Signals.HandleSignal(Frame, CurrentCPU->CurrentThread.load());
if (!ProcessNotChanged)
(&CurrentCPU->CurrentProcess->Info)->LastUpdateTime = TimeManager->GetCounter();
(&CurrentCPU->CurrentThread->Info)->LastUpdateTime = TimeManager->GetCounter();
(&CurrentCPU->CurrentProcess->Info)->LastUpdateTime = TimeManager->GetTimeNs();
(&CurrentCPU->CurrentThread->Info)->LastUpdateTime = TimeManager->GetTimeNs();
this->OneShot(CurrentCPU->CurrentThread->Info.Priority);
if (CurrentCPU->CurrentThread->Security.IsDebugEnabled &&
@ -720,7 +720,7 @@ namespace Tasking::Scheduler
#endif
}
this->SchedulerTicks.store(size_t(TimeManager->GetCounter() - SchedTmpTicks));
this->SchedulerTicks.store(size_t(TimeManager->GetTimeNs() - SchedTmpTicks));
}
hot nsa nif void Custom::OnInterruptReceived(CPU::SchedulerFrame *Frame)
@ -754,7 +754,7 @@ namespace Tasking::Scheduler
}
debug("Waiting for processes to terminate");
uint64_t timeout = TimeManager->CalculateTarget(20, Time::Units::Seconds);
uint64_t timeout = TimeManager->GetTimeNs() + Time::FromSeconds(20);
while (this->GetProcessList().size() > 0)
{
trace("Waiting for %d processes to terminate", this->GetProcessList().size());
@ -780,7 +780,7 @@ namespace Tasking::Scheduler
ctx->GetCurrentProcess()->Name,
ctx->GetCurrentProcess()->ID);
if (TimeManager->GetCounter() > timeout)
if (TimeManager->GetTimeNs() > timeout)
{
error("Timeout waiting for processes to terminate");
break;

8
Kernel/tasking/task.cpp
View File

@ -167,7 +167,7 @@ namespace Tasking
this->Yield();
}
void Task::Sleep(uint64_t Milliseconds, bool NoSwitch)
void Task::Sleep(uint64_t Nanoseconds, bool NoSwitch)
{
TCB *thread = this->GetCurrentThread();
PCB *process = thread->Parent;
@ -179,13 +179,11 @@ namespace Tasking
if (process->Threads.size() == 1)
process->SetState(TaskState::Sleeping);
thread->Info.SleepUntil =
TimeManager->CalculateTarget(Milliseconds,
Time::Units::Milliseconds);
thread->Info.SleepUntil = TimeManager->GetTimeNs() + Nanoseconds;
}
// #ifdef DEBUG
// uint64_t TicksNow = TimeManager->GetCounter();
// uint64_t TicksNow = TimeManager->GetTimeNs();
// #endif
// debug("Thread \"%s\"(%d) is going to sleep until %llu, current %llu, diff %llu",
// thread->Name, thread->ID, thread->Info.SleepUntil,

2
Kernel/tasking/thread.cpp
View File

@ -650,7 +650,7 @@ namespace Tasking
this->AllocatedMemory += strlen(this->Parent->Name) + 1;
this->AllocatedMemory += sizeof(Memory::StackGuard);
this->Info.SpawnTime = TimeManager->GetCounter();
this->Info.SpawnTime = TimeManager->GetTimeNs();
this->Parent->Threads.push_back(this);
if (this->Parent->Threads.size() == 1 &&