Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CurrentThread/Process should be atomic

Browse Source
This commit is contained in:
Alex 2023-02-18 04:10:41 +02:00
parent f5a724145e
commit 95a78ef939
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KThread.cpp
View File

@ -182,7 +182,6 @@ void KernelMainThread()
Display->Print('.', 0); Display->Print('.', 0);
Display->SetBuffer(0); Display->SetBuffer(0);
CPU::Interrupts(CPU::Disable);
ExecuteThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)Execute::StartExecuteService); ExecuteThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)Execute::StartExecuteService);
ExecuteThread->Rename("Library Manager"); ExecuteThread->Rename("Library Manager");
ExecuteThread->SetCritical(true); ExecuteThread->SetCritical(true);
@ -206,7 +205,6 @@ void KernelMainThread()
TaskManager->GetSecurityManager()->TrustToken(ret.Thread->Security.UniqueToken, Tasking::TTL::FullTrust); TaskManager->GetSecurityManager()->TrustToken(ret.Thread->Security.UniqueToken, Tasking::TTL::FullTrust);
ret.Thread->SetCritical(true); ret.Thread->SetCritical(true);
KPrint("Waiting for \e22AAFF%s\eCCCCCC to start...", Config.InitPath); KPrint("Waiting for \e22AAFF%s\eCCCCCC to start...", Config.InitPath);
CPU::Interrupts(CPU::Enable);
TaskManager->GetCurrentThread()->SetPriority(Tasking::Idle); TaskManager->GetCurrentThread()->SetPriority(Tasking::Idle);
TaskManager->WaitForThread(ret.Thread); TaskManager->WaitForThread(ret.Thread);
ExitCode = ret.Thread->GetExitCode(); ExitCode = ret.Thread->GetExitCode();

6
Tasking/Scheduler.cpp
View File

@ -155,7 +155,7 @@ namespace Tasking
for (size_t i = 0; i < CurrentCPU->CurrentProcess->Threads.size(); i++) for (size_t i = 0; i < CurrentCPU->CurrentProcess->Threads.size(); i++)
{ {
if (CurrentCPU->CurrentProcess->Threads[i] == CurrentCPU->CurrentThread) if (CurrentCPU->CurrentProcess->Threads[i] == CurrentCPU->CurrentThread.Load())
{ {
size_t TempIndex = i; size_t TempIndex = i;
RetryAnotherThread: RetryAnotherThread:
@ -199,7 +199,7 @@ namespace Tasking
bool Skip = true; bool Skip = true;
foreach (auto pcb in ListProcess) foreach (auto pcb in ListProcess)
{ {
if (pcb == CurrentCPU->CurrentProcess) if (pcb == CurrentCPU->CurrentProcess.Load())
{ {
Skip = false; Skip = false;
gnap_schedbg("Found current process %#lx", pcb); gnap_schedbg("Found current process %#lx", pcb);
@ -475,7 +475,7 @@ namespace Tasking
} }
#endif #endif
if (unlikely(InvalidPCB(CurrentCPU->CurrentProcess) || InvalidTCB(CurrentCPU->CurrentThread))) if (unlikely(InvalidPCB(CurrentCPU->CurrentProcess.Load()) || InvalidTCB(CurrentCPU->CurrentThread.Load())))
{ {
schedbg("Invalid process or thread. Finding a new one."); schedbg("Invalid process or thread. Finding a new one.");
if (this->FindNewProcess(CurrentCPU)) if (this->FindNewProcess(CurrentCPU))

30
Tasking/Task.cpp
View File

@ -198,8 +198,8 @@ namespace Tasking
CPU::Halt(true); CPU::Halt(true);
} }
PCB *Task::GetCurrentProcess() { return GetCurrentCPU()->CurrentProcess; } PCB *Task::GetCurrentProcess() { return GetCurrentCPU()->CurrentProcess.Load(); }
TCB *Task::GetCurrentThread() { return GetCurrentCPU()->CurrentThread; } TCB *Task::GetCurrentThread() { return GetCurrentCPU()->CurrentThread.Load(); }
PCB *Task::GetProcessByID(UPID ID) PCB *Task::GetProcessByID(UPID ID)
{ {
@ -226,7 +226,7 @@ namespace Tasking
return; return;
debug("Waiting for process \"%s\"(%d)", pcb->Name, pcb->ID); debug("Waiting for process \"%s\"(%d)", pcb->Name, pcb->ID);
while (pcb->Status != TaskStatus::Terminated) while (pcb->Status != TaskStatus::Terminated)
CPU::Halt(); CPU::Pause();
} }
void Task::WaitForThread(TCB *tcb) void Task::WaitForThread(TCB *tcb)
@ -237,7 +237,7 @@ namespace Tasking
return; return;
debug("Waiting for thread \"%s\"(%d)", tcb->Name, tcb->ID); debug("Waiting for thread \"%s\"(%d)", tcb->Name, tcb->ID);
while (tcb->Status != TaskStatus::Terminated) while (tcb->Status != TaskStatus::Terminated)
CPU::Halt(); CPU::Pause();
} }
void Task::WaitForProcessStatus(PCB *pcb, TaskStatus status) void Task::WaitForProcessStatus(PCB *pcb, TaskStatus status)
@ -248,7 +248,7 @@ namespace Tasking
return; return;
debug("Waiting for process \"%s\"(%d) to reach status: %d", pcb->Name, pcb->ID, status); debug("Waiting for process \"%s\"(%d) to reach status: %d", pcb->Name, pcb->ID, status);
while (pcb->Status != status) while (pcb->Status != status)
CPU::Halt(); CPU::Pause();
} }
void Task::WaitForThreadStatus(TCB *tcb, TaskStatus status) void Task::WaitForThreadStatus(TCB *tcb, TaskStatus status)
@ -259,7 +259,7 @@ namespace Tasking
return; return;
debug("Waiting for thread \"%s\"(%d) to reach status: %d", tcb->Name, tcb->ID, status); debug("Waiting for thread \"%s\"(%d) to reach status: %d", tcb->Name, tcb->ID, status);
while (tcb->Status != status) while (tcb->Status != status)
CPU::Halt(); CPU::Pause();
} }
void Task::Sleep(uint64_t Milliseconds) void Task::Sleep(uint64_t Milliseconds)
@ -818,15 +818,15 @@ namespace Tasking
#if defined(__amd64__) #if defined(__amd64__)
((APIC::Timer *)Interrupts::apicTimer[0])->OneShot(CPU::x64::IRQ16, 100); ((APIC::Timer *)Interrupts::apicTimer[0])->OneShot(CPU::x64::IRQ16, 100);
for (int i = 1; i < SMP::CPUCores; i++) /* FIXME: The kernel is not ready for multi-core tasking. */
{ // for (int i = 1; i < SMP::CPUCores; i++)
// ((APIC::Timer *)Interrupts::apicTimer[i])->OneShot(CPU::x64::IRQ16, 100); // {
// TODO: Lock was the fault here. Now crash handler should support SMP. // ((APIC::Timer *)Interrupts::apicTimer[i])->OneShot(CPU::x64::IRQ16, 100);
// APIC::InterruptCommandRegisterLow icr; // APIC::InterruptCommandRegisterLow icr;
// icr.Vector = CPU::x64::IRQ16; // icr.Vector = CPU::x64::IRQ16;
// icr.Level = APIC::APICLevel::Assert; // icr.Level = APIC::APICLevel::Assert;
// ((APIC::APIC *)Interrupts::apic[0])->IPI(i, icr); // ((APIC::APIC *)Interrupts::apic[0])->IPI(i, icr);
} // }
#elif defined(__i386__) #elif defined(__i386__)
#elif defined(__aarch64__) #elif defined(__aarch64__)
#endif #endif

7
include/smp.hpp
View File

@ -2,6 +2,7 @@
#define __FENNIX_KERNEL_SMP_H__ #define __FENNIX_KERNEL_SMP_H__
#include <types.h> #include <types.h>
#include <atomic.hpp>
#include <task.hpp> #include <task.hpp>
/** @brief Maximum supported number of CPU cores by the kernel */ /** @brief Maximum supported number of CPU cores by the kernel */
@ -34,15 +35,15 @@ struct CPUData
bool IsActive; bool IsActive;
/** @brief Current running process */ /** @brief Current running process */
Tasking::PCB *CurrentProcess; Atomic<Tasking::PCB *> CurrentProcess;
/** @brief Current running thread */ /** @brief Current running thread */
Tasking::TCB *CurrentThread; Atomic<Tasking::TCB *> CurrentThread;
/** @brief Architecture-specific data. */ /** @brief Architecture-specific data. */
CPUArchData Data; CPUArchData Data;
/** @brief Checksum. Used to verify the integrity of the data. Must be equal to CPU_DATA_CHECKSUM (0xC0FFEE). */ /** @brief Checksum. Used to verify the integrity of the data. Must be equal to CPU_DATA_CHECKSUM (0xC0FFEE). */
int Checksum; int Checksum;
} __attribute__((packed)); };
CPUData *GetCurrentCPU(); CPUData *GetCurrentCPU();
CPUData *GetCPU(long ID); CPUData *GetCPU(long ID);