i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scheduler: Be more demanding when cancelling penalties

Browse Source
This commit is contained in:
Pawel Dziepak
2013-10-25 04:12:13 +02:00
parent 9d7e2acf34
commit 45ff530069
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/scheduler/scheduler.cpp
+15 -19
View File
@@ -82,6 +82,7 @@ struct CoreEntry : public DoublyLinkedListLinkImpl<CoreEntry> {
int32 fCoreID; int32 fCoreID;
bigtime_t fReachedBottom;
bigtime_t fActiveTime; bigtime_t fActiveTime;
int32 fCPUBoundThreads; int32 fCPUBoundThreads;
@@ -604,22 +605,8 @@ cancel_penalty(Thread* thread)
if (schedulerThreadData->priority_penalty != 0) if (schedulerThreadData->priority_penalty != 0)
TRACE("cancelling thread %ld penalty\n", thread->id); TRACE("cancelling thread %ld penalty\n", thread->id);
switch (sSchedulerMode) { schedulerThreadData->additional_penalty = 0;
case SCHEDULER_MODE_PERFORMANCE: schedulerThreadData->priority_penalty = 0;
schedulerThreadData->additional_penalty = 0;
schedulerThreadData->priority_penalty = 0;
break;
case SCHEDULER_MODE_POWER_SAVING:
if (schedulerThreadData->additional_penalty != 0)
schedulerThreadData->additional_penalty /= 2;
else if (schedulerThreadData->priority_penalty != 0)
schedulerThreadData->priority_penalty--;
break;
default:
break;
}
} }
@@ -924,9 +911,13 @@ enqueue(Thread* thread, bool newOne)
scheduler_thread_data* schedulerThreadData = thread->scheduler_data; scheduler_thread_data* schedulerThreadData = thread->scheduler_data;
bigtime_t hasSlept = system_time() - schedulerThreadData->went_sleep; int32 core = schedulerThreadData->previous_core;
if (newOne && hasSlept > kThreadQuantum) if (newOne && core >= 0) {
cancel_penalty(thread); if (schedulerThreadData->went_sleep + kThreadQuantum / 4
< sCoreEntries[core].fReachedBottom) {
cancel_penalty(thread);
}
}
int32 threadPriority = get_effective_priority(thread); int32 threadPriority = get_effective_priority(thread);
@@ -1225,6 +1216,11 @@ track_cpu_activity(Thread* oldThread, Thread* nextThread, int32 thisCore)
sCoreEntries[thisCore].fActiveTime += active; sCoreEntries[thisCore].fActiveTime += active;
} }
if (thread_is_idle_thread(nextThread)
|| get_effective_priority(nextThread) == B_LOWEST_ACTIVE_PRIORITY) {
sCoreEntries[thisCore].fReachedBottom = system_time();
}
if (!thread_is_idle_thread(nextThread)) { if (!thread_is_idle_thread(nextThread)) {
oldThread->cpu->last_kernel_time = nextThread->kernel_time; oldThread->cpu->last_kernel_time = nextThread->kernel_time;
oldThread->cpu->last_user_time = nextThread->user_time; oldThread->cpu->last_user_time = nextThread->user_time;