Attachment #330 for bug #230

View | Details | Raw Unified | Return to bug 230
Collapse All | Expand All




DefaultSimulatorImpl::DefaultSimulatorImpl ()
{
  m_stop = false;
  m_stopAt = 0;
  // uids are allocated from 4.
  // uid 0 is "invalid" events
  // uid 1 is "now" events

DefaultSimulatorImpl::Run (void)
{

  while (!m_events->IsEmpty () && !m_stop) 
         (m_stopAt == 0 || m_stopAt > NextTs ())) 
    {
      ProcessOneEvent ();
    }

  m_stop = true;
}

void 
DefaultSimulatorImpl::Stop (Time const &time)
{
  NS_ASSERT (time.IsPositive ());
  Time absolute = Simulator::Now () + time;
  m_stopAt = absolute.GetTimeStep ();
}

//
// Schedule an event for a _relative_ time in the future.

(-)a/src/simulator/default-simulator-impl.h (-2 lines)

Lines 45-51	Link Here

  virtual bool IsFinished (void) const;

  virtual bool IsFinished (void) const;

  virtual Time Next (void) const;

  virtual Time Next (void) const;

  virtual void Stop (void);

  virtual void Stop (void);

  virtual void Stop (Time const &time);

  virtual EventId Schedule (Time const &time, EventImpl *event);

  virtual EventId Schedule (Time const &time, EventImpl *event);

  virtual EventId ScheduleNow (EventImpl *event);

  virtual EventId ScheduleNow (EventImpl *event);

  virtual EventId ScheduleDestroy (EventImpl *event);

  virtual EventId ScheduleDestroy (EventImpl *event);

Lines 66-72	Link Here

  typedef std::list<EventId> DestroyEvents;

  typedef std::list<EventId> DestroyEvents;

  DestroyEvents m_destroyEvents;

  DestroyEvents m_destroyEvents;

  uint64_t m_stopAt;

  bool m_stop;

  bool m_stop;

  Ptr<Scheduler> m_events;

  Ptr<Scheduler> m_events;

  uint32_t m_uid;

  uint32_t m_uid;




  NS_LOG_FUNCTION_NOARGS ();

  m_stop = false;
  m_stopAt = 0;
  m_running = false;
  // uids are allocated from 4.
  // uid 0 is "invalid" events

          {
            done = true;
          }
        //
        // We also want to stop the simulator at some time even if there are events 
        // that have been scheduled out in the future.  If we're in realtime mode, we 
        // actually have time passing, so we must look at the realtime clock to see if 
        // we're past the end time.
        //
        if (m_stopAt && m_stopAt <= m_synchronizer->GetCurrentRealtime ())
          {
            done = true;
          }
      }

      if (done)

{
  NS_LOG_FUNCTION_NOARGS ();
  m_stop = true;
}

static void Placeholder (void) {}

//
// Schedule a stop for a _relative_ time in the future.  If the simulation
// hasn't started yet, this will effectively be an absolute time.
//
void 
RealtimeSimulatorImpl::Stop (Time const &time)
{
  NS_LOG_FUNCTION (time);

  Time tAbsolute = Simulator::Now () + time;
  NS_ASSERT (tAbsolute.IsPositive ());
  NS_ASSERT (tAbsolute >= TimeStep (m_currentTs));
  m_stopAt = tAbsolute.GetTimeStep ();

  //
  // For the realtime case, we need a real event sitting out at the end of time
  // to keep the simulator running (sleeping) while there are no other events 
  // present.  If an "external" device in another thread decides to schedule an
  // event, the sleeping synchronizer will be awakened and the new event will
  // be run.
  //
  // The easiest thing to do is to call back up into the simulator to take 
  // advantage of all of the nice event wrappers.  This will call back down into
  // RealtimeSimulatorImpl::Schedule to do the work.  This path interprets the 
  // time as relative, so pass the relative time.
  //
  Simulator::Schedule (time, &Placeholder);
}

//

(-)a/src/simulator/realtime-simulator-impl.h (-2 lines)

Lines 55-61	Link Here

  virtual bool IsFinished (void) const;

  virtual bool IsFinished (void) const;

  virtual Time Next (void) const;

  virtual Time Next (void) const;

  virtual void Stop (void);

  virtual void Stop (void);

  virtual void Stop (Time const &time);

  virtual EventId Schedule (Time const &time, EventImpl *event);

  virtual EventId Schedule (Time const &time, EventImpl *event);

  virtual EventId ScheduleNow (EventImpl *event);

  virtual EventId ScheduleNow (EventImpl *event);

  virtual EventId ScheduleDestroy (EventImpl *event);

  virtual EventId ScheduleDestroy (EventImpl *event);

Lines 89-95	Link Here

  typedef std::list<EventId> DestroyEvents;

  typedef std::list<EventId> DestroyEvents;

  DestroyEvents m_destroyEvents;

  DestroyEvents m_destroyEvents;

  uint64_t m_stopAt;

  bool m_stop;

  bool m_stop;

  bool m_running;

  bool m_running;

(-)a/src/simulator/simulator-impl.h (-1 lines)

Lines 38-44	Link Here

  virtual bool IsFinished (void) const = 0;

  virtual bool IsFinished (void) const = 0;

  virtual Time Next (void) const = 0;

  virtual Time Next (void) const = 0;

  virtual void Stop (void) = 0;

  virtual void Stop (void) = 0;

  virtual void Stop (Time const &time) = 0;

  virtual EventId Schedule (Time const &time, EventImpl *event) = 0;

  virtual EventId Schedule (Time const &time, EventImpl *event) = 0;

  virtual EventId ScheduleNow (EventImpl *event) = 0;

  virtual EventId ScheduleNow (EventImpl *event) = 0;

  virtual EventId ScheduleDestroy (EventImpl *event) = 0;

  virtual EventId ScheduleDestroy (EventImpl *event) = 0;

(-)a/src/simulator/simulator.cc (-1 / +1 lines)

Lines 169-175	Link Here

169

Simulator::Stop (Time const &time)

169

Simulator::Stop (Time const &time)

170

171

  NS_LOG_FUNCTION (time);

171

  NS_LOG_FUNCTION (time);

172

  GetImpl ()->Stop (time);

172

  Simulator::Schedule (time, &Simulator::Stop);

173

174

175

Time

175

Time

Return to bug 230