From 0e8b2225affc75d9601f93b999100b01d873db83 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 28 Mar 2012 09:02:14 -0400 Subject: [PATCH] bring back Next since it is used internally --- src/mpi/model/distributed-simulator-impl.cc | 14 ++++++++++++++ src/mpi/model/distributed-simulator-impl.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/src/mpi/model/distributed-simulator-impl.cc b/src/mpi/model/distributed-simulator-impl.cc index 95c1bf1fb..c1ff9394b 100644 --- a/src/mpi/model/distributed-simulator-impl.cc +++ b/src/mpi/model/distributed-simulator-impl.cc @@ -253,6 +253,20 @@ DistributedSimulatorImpl::IsFinished (void) const return m_events->IsEmpty () || m_stop; } +uint64_t +DistributedSimulatorImpl::NextTs (void) const +{ + NS_ASSERT (!m_events->IsEmpty ()); + Scheduler::Event ev = m_events->PeekNext (); + return ev.key.m_ts; +} + +Time +DistributedSimulatorImpl::Next (void) const +{ + return TimeStep (NextTs ()); +} + void DistributedSimulatorImpl::Run (void) { diff --git a/src/mpi/model/distributed-simulator-impl.h b/src/mpi/model/distributed-simulator-impl.h index c97829d8f..1db616491 100644 --- a/src/mpi/model/distributed-simulator-impl.h +++ b/src/mpi/model/distributed-simulator-impl.h @@ -121,6 +121,8 @@ private: void CalculateLookAhead (void); void ProcessOneEvent (void); + uint64_t NextTs (void) const; + Time Next (void) const; typedef std::list DestroyEvents; DestroyEvents m_destroyEvents;