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

Optimize GetCurrentCPU

Browse Source
This commit is contained in:
Alex 2023-02-14 16:07:02 +02:00
parent b3cbcd474d
commit 2c714bbcbc
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Architecture/amd64/cpu/SymmetricMultiprocessing.cpp
View File

@ -28,17 +28,17 @@ volatile bool CPUEnabled = false;
static __attribute__((aligned(PAGE_SIZE))) CPUData CPUs[MAX_CPU] = {0}; static __attribute__((aligned(PAGE_SIZE))) CPUData CPUs[MAX_CPU] = {0};
CPUData *GetCPU(long id) { return &CPUs[id]; } CPUData *GetCPU(long id) { return &CPUs[id]; }
CPUData *GetCurrentCPU() SafeFunction CPUData *GetCurrentCPU()
{ {
CPUData *data = (CPUData *)CPU::x64::rdmsr(CPU::x64::MSR_GS_BASE); CPUData *data = (CPUData *)CPU::x64::rdmsr(CPU::x64::MSR_GS_BASE);
if (data == nullptr && Interrupts::apic[0]) if (unlikely(data == nullptr && Interrupts::apic[0]))
data = &CPUs[((APIC::APIC *)Interrupts::apic[0])->Read(APIC::APIC_ID) >> 24]; data = &CPUs[((APIC::APIC *)Interrupts::apic[0])->Read(APIC::APIC_ID) >> 24];
if (data == nullptr) if (unlikely(data == nullptr))
return nullptr; // The caller should handle this. return nullptr; // The caller should handle this.
if (!data->IsActive) if (unlikely(data->IsActive != true))
{ {
error("CPU %d is not active!", data->ID); error("CPU %d is not active!", data->ID);
if ((&CPUs[0])->IsActive) if ((&CPUs[0])->IsActive)
@ -46,6 +46,7 @@ CPUData *GetCurrentCPU()
else else
return nullptr; // We are in trouble. return nullptr; // We are in trouble.
} }
assert(data->Checksum == CPU_DATA_CHECKSUM); // This should never happen. assert(data->Checksum == CPU_DATA_CHECKSUM); // This should never happen.
return data; return data;
} }

2
Network/NetworkController.cpp
View File

@ -134,7 +134,7 @@ namespace NetworkInterfaceManager
} }
TaskManager->GetCurrentThread()->SetPriority(Tasking::TaskPriority::Idle); TaskManager->GetCurrentThread()->SetPriority(Tasking::TaskPriority::Idle);
CPU::Pause(true); CPU::Halt(true);
} }
void NetworkInterface::StopNetworkStack() void NetworkInterface::StopNetworkStack()