F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize Binary Heap comparison operator

Browse Source
This commit is contained in:
Mathieu Lacage
2006-12-12 14:30:44 +01:00
parent 671b1cdf4e
commit cd7c70b0a1
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/simulator/scheduler-heap.cc
View File

@@ -120,14 +120,31 @@ SchedulerHeap::Exch (uint32_t a, uint32_t b)
}
bool
SchedulerHeap::IsLess (uint32_t a, uint32_t b)
SchedulerHeap::IsLower (Scheduler::EventKey const*a, Scheduler::EventKey const*b) const
{
Scheduler::EventKeyCompare compare;
return compare (m_heap[a].second, m_heap[b].second);
if (a->m_ns < b->m_ns)
{
return true;
}
else if (a->m_ns == b->m_ns &&
a->m_uid < b->m_uid)
{
return true;
}
else
{
return false;
}
}
bool
SchedulerHeap::IsLess (uint32_t a, uint32_t b) const
{
return IsLower (&m_heap[a].second, &m_heap[b].second);
}
uint32_t
SchedulerHeap::Smallest (uint32_t a, uint32_t b)
SchedulerHeap::Smallest (uint32_t a, uint32_t b) const
{
return IsLess (a,b)?a:b;
}
@@ -215,7 +232,6 @@ SchedulerHeap::RealRemoveNext (void)
EventImpl *
SchedulerHeap::RealRemove (EventId id, Scheduler::EventKey *key)
{
Scheduler::EventKeyCompare compare;
uint32_t top;
uint32_t bottom;
bottom = 1;
@@ -225,7 +241,7 @@ SchedulerHeap::RealRemove (EventId id, Scheduler::EventKey *key)
while (top != bottom)
{
uint32_t i = bottom + (top - bottom) / 2;
if (compare (*key, m_heap[i].second))
if (IsLower (key, &m_heap[i].second))
{
top = i;
}