fix coding style

This commit is contained in:
Mathieu Lacage
2006-10-20 14:21:33 +02:00
parent 90df8d054b
commit 676dc8b5ac
5 changed files with 37 additions and 23 deletions

View File

@@ -35,9 +35,10 @@ EventImpl::EventImpl ()
void
EventImpl::Invoke (void)
{
if (!m_cancel) {
if (!m_cancel)
{
Notify ();
}
}
}
void
EventImpl::SetInternalIterator (void *tag)

View File

@@ -157,10 +157,11 @@ SchedulerHeap::BottomUp (void)
{
uint32_t index = Last ();
while (!IsRoot (index) &&
IsLess (index, Parent (index))) {
IsLess (index, Parent (index)))
{
Exch(index, Parent (index));
index = Parent (index);
}
}
}
void
@@ -168,27 +169,32 @@ SchedulerHeap::TopDown (void)
{
uint32_t index = Root ();
uint32_t right = RightChild (index);
while (!IsBottom (right)) {
while (!IsBottom (right))
{
uint32_t left = LeftChild (index);
uint32_t tmp = Smallest (left, right);
if (IsLess (index, tmp)) {
if (IsLess (index, tmp))
{
return;
}
}
Exch (index, tmp);
index = tmp;
right = RightChild (index);
}
if (IsBottom (index)) {
}
if (IsBottom (index))
{
return;
}
}
assert (!IsBottom (index));
uint32_t left = LeftChild (index);
if (IsBottom (left)) {
if (IsBottom (left))
{
return;
}
if (IsLess (index, left)) {
}
if (IsLess (index, left))
{
return;
}
}
Exch (index, left);
}

View File

@@ -63,12 +63,14 @@ EventId
SchedulerList::RealInsert (EventImpl *event, Scheduler::EventKey key)
{
Scheduler::EventKeyCompare compare;
for (EventsI i = m_events.begin (); i != m_events.end (); i++) {
if (compare (key, i->second)) {
for (EventsI i = m_events.begin (); i != m_events.end (); i++)
{
if (compare (key, i->second))
{
m_events.insert (i, std::make_pair (event, key));
return GetEventId (key, i);
}
}
}
}
m_events.push_back (std::make_pair (event, key));
return GetEventId (key, --(m_events.end ()));
}

View File

@@ -57,7 +57,7 @@ SchedulerMap::GetFromEvent (EventImpl *ev) const
EventMapI i;
void *tag = ev->GetInternalIterator ();
memcpy (&i, &(tag), sizeof (i));
return i;
return i;
}
EventId

View File

@@ -36,13 +36,18 @@ bool
Scheduler::EventKeyCompare::operator () (struct EventKey a, struct EventKey b)
{
assert (a.m_uid != b.m_uid);
if (a.m_ns < b.m_ns) {
if (a.m_ns < b.m_ns)
{
return true;
} else if (a.m_ns == b.m_ns && a.m_uid < b.m_uid) {
}
else if (a.m_ns == b.m_ns && a.m_uid < b.m_uid)
{
return true;
} else {
}
else
{
return false;
}
}
}