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

scheduler_affine: Use min-max heap as per-core CPU heap

Browse Source
This commit is contained in:
Pawel Dziepak
2013-10-17 19:23:27 +02:00
parent 18c0d163ed
commit da3a48f4a8
1 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/scheduler/scheduler_affine.cpp
+11 -30
View File
@@ -28,6 +28,7 @@
#include <thread.h> #include <thread.h>
#include <timer.h> #include <timer.h>
#include <util/Heap.h> #include <util/Heap.h>
#include <util/MinMaxHeap.h>
#include <util/Random.h> #include <util/Random.h>
#include "RunQueue.h" #include "RunQueue.h"
@@ -48,20 +49,13 @@ const bigtime_t kMinThreadQuantum = 3000;
const bigtime_t kMaxThreadQuantum = 10000; const bigtime_t kMaxThreadQuantum = 10000;
struct CPUHeapEntry : public HeapLinkImpl<CPUHeapEntry, int32> { struct CPUHeapEntry : public MinMaxHeapLinkImpl<CPUHeapEntry, int32> {
HeapLink<CPUHeapEntry, int32> fMaxHeap;
int32 fCPUNumber; int32 fCPUNumber;
}; };
static CPUHeapEntry* sCPUPriorityEntries; static CPUHeapEntry* sCPUPriorityEntries;
typedef Heap<CPUHeapEntry, int32> AffineCPUHeap; typedef MinMaxHeap<CPUHeapEntry, int32> AffineCPUHeap;
typedef Heap<CPUHeapEntry, int32, HeapGreaterCompare<int32>,
HeapMemberGetLink<CPUHeapEntry, int32, &CPUHeapEntry::fMaxHeap> >
AffineCPUMaxHeap;
// TODO: Use one min-max heap per-core
static AffineCPUHeap* sCPUPriorityHeaps; static AffineCPUHeap* sCPUPriorityHeaps;
static AffineCPUMaxHeap* sCPUMaxPriorityHeaps;
struct CoreHeapEntry : public HeapLinkImpl<CoreHeapEntry, int32> { struct CoreHeapEntry : public HeapLinkImpl<CoreHeapEntry, int32> {
int32 fCoreID; int32 fCoreID;
@@ -214,25 +208,25 @@ dump_heap(AffineCPUHeap* heap)
AffineCPUHeap temp; AffineCPUHeap temp;
kprintf("cpu priority actual priority\n"); kprintf("cpu priority actual priority\n");
CPUHeapEntry* entry = heap->PeekRoot(); CPUHeapEntry* entry = heap->PeekMinimum();
while (entry) { while (entry) {
int32 cpu = entry->fCPUNumber; int32 cpu = entry->fCPUNumber;
int32 key = AffineCPUHeap::GetKey(entry); int32 key = AffineCPUHeap::GetKey(entry);
kprintf("%3" B_PRId32 " %8" B_PRId32 " %15" B_PRId32 "\n", cpu, key, kprintf("%3" B_PRId32 " %8" B_PRId32 " %15" B_PRId32 "\n", cpu, key,
affine_get_effective_priority(gCPU[cpu].running_thread)); affine_get_effective_priority(gCPU[cpu].running_thread));
heap->RemoveRoot(); heap->RemoveMinimum();
temp.Insert(entry, key); temp.Insert(entry, key);
entry = heap->PeekRoot(); entry = heap->PeekMinimum();
} }
entry = temp.PeekRoot(); entry = temp.PeekMinimum();
while (entry) { while (entry) {
int32 key = AffineCPUHeap::GetKey(entry); int32 key = AffineCPUHeap::GetKey(entry);
temp.RemoveRoot(); temp.RemoveMinimum();
heap->Insert(entry, key); heap->Insert(entry, key);
entry = temp.PeekRoot(); entry = temp.PeekMinimum();
} }
} }
@@ -355,10 +349,9 @@ affine_update_priority_heaps(int32 cpu, int32 priority)
int32 core = sCPUToCore[cpu]; int32 core = sCPUToCore[cpu];
sCPUPriorityHeaps[core].ModifyKey(&sCPUPriorityEntries[cpu], priority); sCPUPriorityHeaps[core].ModifyKey(&sCPUPriorityEntries[cpu], priority);
sCPUMaxPriorityHeaps[core].ModifyKey(&sCPUPriorityEntries[cpu], priority);
int32 maxPriority int32 maxPriority
= AffineCPUMaxHeap::GetKey(sCPUMaxPriorityHeaps[core].PeekRoot()); = AffineCPUHeap::GetKey(sCPUPriorityHeaps[core].PeekMaximum());
int32 corePriority = AffineCoreHeap::GetKey(&sCorePriorityEntries[core]); int32 corePriority = AffineCoreHeap::GetKey(&sCorePriorityEntries[core]);
if (corePriority != maxPriority) if (corePriority != maxPriority)
@@ -378,7 +371,7 @@ affine_choose_core(void)
static inline int32 static inline int32
affine_choose_cpu(int32 core) affine_choose_cpu(int32 core)
{ {
CPUHeapEntry* entry = sCPUPriorityHeaps[core].PeekRoot(); CPUHeapEntry* entry = sCPUPriorityHeaps[core].PeekMinimum();
ASSERT(entry != NULL); ASSERT(entry != NULL);
return entry->fCPUNumber; return entry->fCPUNumber;
} }
@@ -999,12 +992,6 @@ scheduler_affine_init()
return B_NO_MEMORY; return B_NO_MEMORY;
ArrayDeleter<AffineCPUHeap> cpuPriorityHeapDeleter(sCPUPriorityHeaps); ArrayDeleter<AffineCPUHeap> cpuPriorityHeapDeleter(sCPUPriorityHeaps);
sCPUMaxPriorityHeaps = new AffineCPUMaxHeap[coreCount];
if (sCPUMaxPriorityHeaps == NULL)
return B_NO_MEMORY;
ArrayDeleter<AffineCPUMaxHeap> cpuMaxPriorityHeapDeleter(
sCPUMaxPriorityHeaps);
for (int32 i = 0; i < cpuCount; i++) { for (int32 i = 0; i < cpuCount; i++) {
sCPUPriorityEntries[i].fCPUNumber = i; sCPUPriorityEntries[i].fCPUNumber = i;
int32 core = sCPUToCore[i]; int32 core = sCPUToCore[i];
@@ -1014,11 +1001,6 @@ scheduler_affine_init()
B_IDLE_PRIORITY); B_IDLE_PRIORITY);
if (result != B_OK) if (result != B_OK)
return result; return result;
result = sCPUMaxPriorityHeaps[core].Insert(&sCPUPriorityEntries[i],
B_IDLE_PRIORITY);
if (result != B_OK)
return result;
} }
sCorePriorityHeap = new AffineCoreHeap; sCorePriorityHeap = new AffineCoreHeap;
@@ -1073,7 +1055,6 @@ scheduler_affine_init()
runQueuesDeleter.Detach(); runQueuesDeleter.Detach();
pinnedRunQueuesDeleter.Detach(); pinnedRunQueuesDeleter.Detach();
corePriorityHeapDeleter.Detach(); corePriorityHeapDeleter.Detach();
cpuMaxPriorityHeapDeleter.Detach();
cpuPriorityHeapDeleter.Detach(); cpuPriorityHeapDeleter.Detach();
corePriorityEntriesDeleter.Detach(); corePriorityEntriesDeleter.Detach();
cpuPriorityEntriesDeleter.Detach(); cpuPriorityEntriesDeleter.Detach();