Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scheduler: Remove unnecessary check against disabled CPU

Browse Source
This commit is contained in:
Pawel Dziepak 2014-01-06 07:35:36 +01:00
parent 8cf8e53774
commit a5f45afa6c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/kernel/scheduler/scheduler.cpp
View File

@ -445,14 +445,14 @@ reschedule(int32 nextState)
nextThreadData nextThreadData
= cpu->ChooseNextThread(enqueueOldThread ? oldThreadData : NULL, = cpu->ChooseNextThread(enqueueOldThread ? oldThreadData : NULL,
putOldThreadAtBack); putOldThreadAtBack);
// update CPU heap
CoreCPUHeapLocker cpuLocker(core);
cpu->UpdatePriority(nextThreadData->GetEffectivePriority());
} }
Thread* nextThread = nextThreadData->GetThread(); Thread* nextThread = nextThreadData->GetThread();
ASSERT(!gCPU[thisCPU].disabled || thread_is_idle_thread(nextThread)); ASSERT(!gCPU[thisCPU].disabled || thread_is_idle_thread(nextThread));
// update CPU heap
CoreCPUHeapLocker cpuLocker(core);
cpu->UpdatePriority(nextThreadData->GetEffectivePriority());
cpuLocker.Unlock();
if (nextThread != oldThread) { if (nextThread != oldThread) {
if (enqueueOldThread) { if (enqueueOldThread) {

4
src/system/kernel/scheduler/scheduler_cpu.cpp
View File

@ -152,8 +152,7 @@ CPUEntry::UpdatePriority(int32 priority)
{ {
SCHEDULER_ENTER_FUNCTION(); SCHEDULER_ENTER_FUNCTION();
if (gCPU[fCPUNumber].disabled) ASSERT(!gCPU[fCPUNumber].disabled);
return;
int32 oldPriority = CPUPriorityHeap::GetKey(this); int32 oldPriority = CPUPriorityHeap::GetKey(this);
if (oldPriority == priority) if (oldPriority == priority)
@ -176,6 +175,7 @@ CPUEntry::ComputeLoad()
SCHEDULER_ENTER_FUNCTION(); SCHEDULER_ENTER_FUNCTION();
ASSERT(gTrackLoad); ASSERT(gTrackLoad);
ASSERT(!gCPU[fCPUNumber].disabled);
ASSERT(fCPUNumber == smp_get_current_cpu()); ASSERT(fCPUNumber == smp_get_current_cpu());
int oldLoad = compute_load(fMeasureTime, fMeasureActiveTime, fLoad); int oldLoad = compute_load(fMeasureTime, fMeasureActiveTime, fLoad);