--- a/src/simulator/realtime-simulator-impl.cc Fri Oct 10 21:01:50 2008 -0700
+++ b/src/simulator/realtime-simulator-impl.cc Tue Oct 14 22:52:41 2008 -0700
@@ -629,7 +629,7 @@
// Schedule an event for a _relative_ time in the future.
//
EventId
-RealtimeSimulatorImpl::ScheduleReal (Time const &time, const Ptr<EventImpl> &event)
+RealtimeSimulatorImpl::ScheduleRealtime (Time const &time, const Ptr<EventImpl> &event)
{
NS_LOG_FUNCTION (time << event);
@@ -638,7 +638,7 @@
CriticalSection cs (m_mutex);
uint64_t ts = m_synchronizer->GetCurrentRealtime () + time.GetTimeStep ();
- NS_ASSERT_MSG (ts >= m_currentTs, "RealtimeSimulatorImpl::ScheduleReal(): schedule for time < m_currentTs");
+ NS_ASSERT_MSG (ts >= m_currentTs, "RealtimeSimulatorImpl::ScheduleRealtime(): schedule for time < m_currentTs");
id = EventId (event, ts, m_uid);
m_uid++;
++m_unscheduledEvents;
@@ -650,7 +650,7 @@
}
EventId
-RealtimeSimulatorImpl::ScheduleRealNow (const Ptr<EventImpl> &event)
+RealtimeSimulatorImpl::ScheduleRealtimeNow (const Ptr<EventImpl> &event)
{
NS_LOG_FUNCTION_NOARGS ();
EventId id;
@@ -662,7 +662,7 @@
// realtime clock. If we're not, then m_currentTs is were we stopped.
//
uint64_t ts = m_running ? m_synchronizer->GetCurrentRealtime () : m_currentTs;
- NS_ASSERT_MSG (ts >= m_currentTs, "RealtimeSimulatorImpl::ScheduleRealNow(): schedule for time < m_currentTs");
+ NS_ASSERT_MSG (ts >= m_currentTs, "RealtimeSimulatorImpl::ScheduleRealrimeNow(): schedule for time < m_currentTs");
id = EventId (event, ts, m_uid);
m_uid++;
++m_unscheduledEvents;
@@ -674,7 +674,7 @@
}
Time
-RealtimeSimulatorImpl::RealNow (void) const
+RealtimeSimulatorImpl::RealtimeNow (void) const
{
return TimeStep (m_synchronizer->GetCurrentRealtime ());
}