From ebe5420f845cae655b92303a8b664320307248fa Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Thu, 26 Dec 2013 19:36:39 +0100 Subject: [PATCH] scheduler: No need for gQuantumLengths to be global --- src/system/kernel/scheduler/scheduler_thread.cpp | 10 +++++----- src/system/kernel/scheduler/scheduler_thread.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/system/kernel/scheduler/scheduler_thread.cpp b/src/system/kernel/scheduler/scheduler_thread.cpp index 70f540a94b..fb6c8aa54e 100644 --- a/src/system/kernel/scheduler/scheduler_thread.cpp +++ b/src/system/kernel/scheduler/scheduler_thread.cpp @@ -9,7 +9,7 @@ using namespace Scheduler; -bigtime_t Scheduler::gQuantumLengths[THREAD_MAX_SET_PRIORITY + 1]; +static bigtime_t sQuantumLengths[THREAD_MAX_SET_PRIORITY + 1]; ThreadData::ThreadData(Thread* thread) @@ -130,21 +130,21 @@ ThreadData::ComputeQuantumLengths() for (int32 priority = 0; priority <= THREAD_MAX_SET_PRIORITY; priority++) { const bigtime_t kQuantum0 = gCurrentMode->base_quantum; if (priority >= B_URGENT_DISPLAY_PRIORITY) { - gQuantumLengths[priority] = kQuantum0; + sQuantumLengths[priority] = kQuantum0; continue; } const bigtime_t kQuantum1 = kQuantum0 * gCurrentMode->quantum_multipliers[0]; if (priority > B_NORMAL_PRIORITY) { - gQuantumLengths[priority] = _ScaleQuantum(kQuantum1, kQuantum0, + sQuantumLengths[priority] = _ScaleQuantum(kQuantum1, kQuantum0, B_URGENT_DISPLAY_PRIORITY, B_NORMAL_PRIORITY, priority); continue; } const bigtime_t kQuantum2 = kQuantum0 * gCurrentMode->quantum_multipliers[1]; - gQuantumLengths[priority] = _ScaleQuantum(kQuantum2, kQuantum1, + sQuantumLengths[priority] = _ScaleQuantum(kQuantum2, kQuantum1, B_NORMAL_PRIORITY, B_IDLE_PRIORITY, priority); } } @@ -209,7 +209,7 @@ ThreadData::_ChooseCPU(CoreEntry* core, bool& rescheduleNeeded) const inline bigtime_t ThreadData::_GetBaseQuantum() const { - return gQuantumLengths[GetEffectivePriority()]; + return sQuantumLengths[GetEffectivePriority()]; } diff --git a/src/system/kernel/scheduler/scheduler_thread.h b/src/system/kernel/scheduler/scheduler_thread.h index 7500bcbc7d..022cf34eb1 100644 --- a/src/system/kernel/scheduler/scheduler_thread.h +++ b/src/system/kernel/scheduler/scheduler_thread.h @@ -119,8 +119,6 @@ public: virtual void operator()(ThreadData* thread) = 0; }; -extern bigtime_t gQuantumLengths[THREAD_MAX_SET_PRIORITY + 1]; - inline bool ThreadData::HasCacheExpired() const