--- a/src/simulator/scheduler-list.cc Wed Nov 01 13:00:34 2006 +0100
+++ b/src/simulator/scheduler-list.cc Wed Nov 01 13:11:30 2006 +0100
@@ -1,4 +1,4 @@
-/* -*- Mode:NS3; -*- */
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2005 INRIA
* All rights reserved.
@@ -40,82 +40,82 @@
EventId
SchedulerList::GetEventId (Scheduler::EventKey key, EventsI i)
{
- assert (sizeof (i) <= sizeof (void *));
- void *internalIterator;
- memcpy ((char *)&(internalIterator), (char *)&i, sizeof (void *));
- EventImpl *ev = i->first;
- ev->SetInternalIterator (internalIterator);
- return EventId (ev, key.m_ns, key.m_uid);
+ assert (sizeof (i) <= sizeof (void *));
+ void *internalIterator;
+ memcpy ((char *)&(internalIterator), (char *)&i, sizeof (void *));
+ EventImpl *ev = i->first;
+ ev->SetInternalIterator (internalIterator);
+ return EventId (ev, key.m_ns, key.m_uid);
}
SchedulerList::EventsI
SchedulerList::GetIterator (EventId id)
{
- SchedulerList::EventsI i;
- assert (sizeof (i) <= sizeof (void *));
- EventImpl *ev = id.GetEventImpl ();
- void *internalIterator = ev->GetInternalIterator ();
- memcpy ((char *)&i, (char *)&(internalIterator), sizeof (void *));
- return i;
+ SchedulerList::EventsI i;
+ assert (sizeof (i) <= sizeof (void *));
+ EventImpl *ev = id.GetEventImpl ();
+ void *internalIterator = ev->GetInternalIterator ();
+ memcpy ((char *)&i, (char *)&(internalIterator), sizeof (void *));
+ return i;
}
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))
- {
- 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 ()));
+ Scheduler::EventKeyCompare compare;
+ 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 ()));
}
bool
SchedulerList::RealIsEmpty (void) const
{
- return m_events.empty ();
+ return m_events.empty ();
}
EventImpl *
SchedulerList::RealPeekNext (void) const
{
- return m_events.front ().first;
+ return m_events.front ().first;
}
Scheduler::EventKey
SchedulerList::RealPeekNextKey (void) const
{
- return m_events.front ().second;
+ return m_events.front ().second;
}
void
SchedulerList::RealRemoveNext (void)
{
- m_events.pop_front ();
+ m_events.pop_front ();
}
EventImpl *
SchedulerList::RealRemove (EventId id, Scheduler::EventKey *key)
{
- EventsI i = GetIterator (id);
- *key = i->second;
- assert (key->m_ns == id.GetNs () &&
- key->m_uid == id.GetUid ());
- EventImpl *ev = i->first;
- m_events.erase (i);
- return ev;
+ EventsI i = GetIterator (id);
+ *key = i->second;
+ assert (key->m_ns == id.GetNs () &&
+ key->m_uid == id.GetUid ());
+ EventImpl *ev = i->first;
+ m_events.erase (i);
+ return ev;
}
bool
SchedulerList::RealIsValid (EventId id)
{
- EventsI i = GetIterator (id);
- Scheduler::EventKey key = i->second;
- return (key.m_ns == id.GetNs () &&
- key.m_uid == id.GetUid ());
-
+ EventsI i = GetIterator (id);
+ Scheduler::EventKey key = i->second;
+ return (key.m_ns == id.GetNs () &&
+ key.m_uid == id.GetUid ());
+
}
}; // namespace ns3