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

more optimizations

Browse Source
This commit is contained in:
Mathieu Lacage
2007-07-27 17:28:17 +02:00
parent 21be3e3912
commit dcf642ffb0
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/simulator/event-id.cc
View File

@@ -30,7 +30,7 @@ EventId::EventId ()
m_uid (0)
{}
EventId::EventId (Ptr<EventImpl> impl, uint64_t ts, uint32_t uid)
EventId::EventId (const Ptr<EventImpl> &impl, uint64_t ts, uint32_t uid)
: m_eventImpl (impl),
m_ts (ts),
m_uid (uid)

2
src/simulator/event-id.h
View File

@@ -35,7 +35,7 @@ class EventImpl;
class EventId {
public:
EventId ();
EventId (Ptr<EventImpl> impl, uint64_t ts, uint32_t uid);
EventId (const Ptr<EventImpl> &impl, uint64_t ts, uint32_t uid);
/**
* This method is syntactic sugar for the ns3::Simulator::cancel
* method.

18
src/simulator/simulator.cc
View File

@@ -62,9 +62,9 @@ public:
Time Next (void) const;
void Stop (void);
void StopAt (Time const &time);
EventId Schedule (Time const &time, Ptr<EventImpl> event);
EventId ScheduleNow (Ptr<EventImpl> event);
EventId ScheduleDestroy (Ptr<EventImpl> event);
EventId Schedule (Time const &time, const Ptr<EventImpl> &event);
EventId ScheduleNow (const Ptr<EventImpl> &event);
EventId ScheduleDestroy (const Ptr<EventImpl> &event);
void Remove (EventId ev);
void Cancel (EventId &ev);
bool IsExpired (EventId ev);
@@ -202,7 +202,7 @@ SimulatorPrivate::StopAt (Time const &at)
m_stopAt = at.GetTimeStep ();
}
EventId
SimulatorPrivate::Schedule (Time const &time, Ptr<EventImpl> event)
SimulatorPrivate::Schedule (Time const &time, const Ptr<EventImpl> &event)
{
NS_ASSERT (time.IsPositive ());
NS_ASSERT (time >= TimeStep (m_currentTs));
@@ -219,7 +219,7 @@ SimulatorPrivate::Schedule (Time const &time, Ptr<EventImpl> event)
return id;
}
EventId
SimulatorPrivate::ScheduleNow (Ptr<EventImpl> event)
SimulatorPrivate::ScheduleNow (const Ptr<EventImpl> &event)
{
EventId id (event, m_currentTs, m_uid);
if (m_logEnable)
@@ -233,7 +233,7 @@ SimulatorPrivate::ScheduleNow (Ptr<EventImpl> event)
return id;
}
EventId
SimulatorPrivate::ScheduleDestroy (Ptr<EventImpl> event)
SimulatorPrivate::ScheduleDestroy (const Ptr<EventImpl> &event)
{
EventId id (event, m_currentTs, 2);
m_destroyEvents.push_back (id);
@@ -434,17 +434,17 @@ Simulator::MakeEvent (void (*f) (void))
return Ptr<EventImpl> (ev, false);
}
EventId
Simulator::Schedule (Time const &time, Ptr<EventImpl> ev)
Simulator::Schedule (Time const &time, const Ptr<EventImpl> &ev)
{
return GetPriv ()->Schedule (Now () + time, ev);
}
EventId
Simulator::ScheduleNow (Ptr<EventImpl> ev)
Simulator::ScheduleNow (const Ptr<EventImpl> &ev)
{
return GetPriv ()->ScheduleNow (ev);
}
EventId
Simulator::ScheduleDestroy (Ptr<EventImpl> ev)
Simulator::ScheduleDestroy (const Ptr<EventImpl> &ev)
{
return GetPriv ()->ScheduleDestroy (ev);
}

6
src/simulator/simulator.h
View File

@@ -610,9 +610,9 @@ private:
static Ptr<EventImpl> MakeEvent (void (*f) (U1,U2,U3,U4,U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
static SimulatorPrivate *GetPriv (void);
static EventId Schedule (Time const &time, Ptr<EventImpl> event);
static EventId ScheduleDestroy (Ptr<EventImpl> event);
static EventId ScheduleNow (Ptr<EventImpl> event);
static EventId Schedule (Time const &time, const Ptr<EventImpl> &event);
static EventId ScheduleDestroy (const Ptr<EventImpl> &event);
static EventId ScheduleNow (const Ptr<EventImpl> &event);
static SimulatorPrivate *m_priv;
};