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

scheduler: Fix core unassignment

Browse Source
This commit is contained in:
Pawel Dziepak 2014-01-27 00:25:54 +01:00
parent 7adce94d45
commit 931ce674a9
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,7 @@ enqueue(Thread* thread, bool newOne)
CoreEntry* targetCore = NULL;
if (thread->pinned_to_cpu > 0) {
ASSERT(thread->previous_cpu != NULL);
ASSERT(threadData->Core() != NULL);
targetCPU = &gCPUEntries[thread->previous_cpu->cpu_num];
} else if (gSingleCore)
targetCore = &gCoreEntries[0];
@ -380,14 +381,9 @@ reschedule(int32 nextState)
break;
case THREAD_STATE_FREE_ON_RESCHED:
oldThreadData->Dies();
if (gCPU[thisCPU].disabled)
oldThreadData->UnassignCore(true);
break;
default:
oldThreadData->GoesAway();
if (gCPU[thisCPU].disabled)
oldThreadData->UnassignCore(true);
TRACE("not enqueueing thread %ld into run queue next_state = %ld\n",
oldThread->id, nextState);
break;
@ -399,13 +395,12 @@ reschedule(int32 nextState)
ThreadData* nextThreadData;
if (gCPU[thisCPU].disabled) {
if (!oldThreadData->IsIdle()) {
CPURunQueueLocker _(cpu);
nextThreadData = cpu->PeekIdleThread();
cpu->Remove(nextThreadData);
putOldThreadAtBack = oldThread->pinned_to_cpu == 0;
oldThreadData->UnassignCore(true);
CPURunQueueLocker cpuLocker(cpu);
nextThreadData = cpu->PeekIdleThread();
cpu->Remove(nextThreadData);
} else
nextThreadData = oldThreadData;
} else {

13
src/system/kernel/scheduler/scheduler_thread.cpp
View File

@ -199,6 +199,19 @@ ThreadData::ComputeQuantum() const
}
void
ThreadData::UnassignCore(bool running)
{
SCHEDULER_ENTER_FUNCTION();
ASSERT(fCore != NULL);
if (running || fThread->state == B_THREAD_READY)
fReady = false;
if (!fReady)
fCore = NULL;
}
/* static */ void
ThreadData::ComputeQuantumLengths()
{

21
src/system/kernel/scheduler/scheduler_thread.h
View File

@ -87,7 +87,7 @@ public:
inline int32 GetLoad() const { return fNeededLoad; }
inline CoreEntry* Core() const { return fCore; }
inline void UnassignCore(bool running = false);
void UnassignCore(bool running = false);
static void ComputeQuantumLengths();
@ -501,25 +501,6 @@ ThreadData::UpdateActivity(bigtime_t active)
}
inline void
ThreadData::UnassignCore(bool running)
{
SCHEDULER_ENTER_FUNCTION();
ASSERT(fCore != NULL);
if (!fReady)
fCore = NULL;
if (running || fThread->state == B_THREAD_READY) {
if (gTrackCoreLoad)
fCore->UpdateLoad(-fNeededLoad);
fReady = false;
fThread->state = B_THREAD_SUSPENDED;
fCore = NULL;
}
}
} // namespace Scheduler