Attachment #139 for bug #191

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

(-)a/examples/mixed-wireless.cc (-1 / +1 lines)

Lines 358-364 main (int argc, char *argv[])	Link Here

358

  ///////////////////////////////////////////////////////////////////////////

358

  ///////////////////////////////////////////////////////////////////////////

359

360

  NS_LOG_INFO ("Run Simulation.");

360

  NS_LOG_INFO ("Run Simulation.");

361

  Simulator::StopAt (Seconds (stopTime));

361

  Simulator::Stop (Seconds (stopTime));

362

  Simulator::Run ();

362

  Simulator::Run ();

363

  Simulator::Destroy ();

363

  Simulator::Destroy ();

364

(-)a/examples/simple-point-to-point-olsr.cc (-1 / +1 lines)

Lines 161-167 main (int argc, char *argv[])	Link Here

161

  PointToPointHelper::EnablePcapAll ("simple-point-to-point-olsr");

161

  PointToPointHelper::EnablePcapAll ("simple-point-to-point-olsr");

162

  PointToPointHelper::EnableAsciiAll (ascii);

162

  PointToPointHelper::EnableAsciiAll (ascii);

163

164

  Simulator::StopAt (Seconds (30));

164

  Simulator::Stop (Seconds (30));

165

166

  NS_LOG_INFO ("Run Simulation.");

166

  NS_LOG_INFO ("Run Simulation.");

167

  Simulator::Run ();

167

  Simulator::Run ();

(-)a/examples/tcp-large-transfer.cc (-1 / +1 lines)

Lines 191-197 int main (int argc, char *argv[])	Link Here

191

192

  PointToPointHelper::EnablePcapAll ("tcp-large-transfer");

192

  PointToPointHelper::EnablePcapAll ("tcp-large-transfer");

193

194

  Simulator::StopAt (Seconds(1000));

194

  Simulator::Stop (Seconds(1000));

195

  Simulator::Run ();

195

  Simulator::Run ();

196

  Simulator::Destroy ();

196

  Simulator::Destroy ();

197

(-)a/examples/wifi-ap.cc (-1 / +1 lines)

Lines 170-176 int main (int argc, char *argv[])	Link Here

170

  apps.Start (Seconds (0.5));

170

  apps.Start (Seconds (0.5));

171

  apps.Stop (Seconds (43.0));

171

  apps.Stop (Seconds (43.0));

172

173

  Simulator::StopAt (Seconds (44.0));

173

  Simulator::Stop (Seconds (44.0));

174

175

  Config::Connect ("/NodeList/*/DeviceList/*/Tx", MakeCallback (&DevTxTrace));

175

  Config::Connect ("/NodeList/*/DeviceList/*/Tx", MakeCallback (&DevTxTrace));

176

  Config::Connect ("/NodeList/*/DeviceList/*/Rx", MakeCallback (&DevRxTrace));

176

  Config::Connect ("/NodeList/*/DeviceList/*/Rx", MakeCallback (&DevRxTrace));

(-)a/samples/main-random-topology.cc (-1 / +1 lines)

Lines 35-41 int main (int argc, char *argv[])	Link Here

  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",

  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",

                              MakeCallback (&CourseChange));

                              MakeCallback (&CourseChange));

  Simulator::StopAt (Seconds (100.0));

  Simulator::Stop (Seconds (100.0));

  Simulator::Run ();

  Simulator::Run ();

(-)a/samples/main-random-walk.cc (-1 / +1 lines)

Lines 44-50 int main (int argc, char *argv[])	Link Here

  Config::Connect ("/NodeList/*/$ns3::MobilityModel/CourseChange",

  Config::Connect ("/NodeList/*/$ns3::MobilityModel/CourseChange",

                   MakeCallback (&CourseChange));

                   MakeCallback (&CourseChange));

  Simulator::StopAt (Seconds (100.0));

  Simulator::Stop (Seconds (100.0));

  Simulator::Run ();

  Simulator::Run ();

(-)a/src/devices/wifi/wifi-test.cc (-1 / +1 lines)

Lines 81-87 WifiTest::RunOne (void)	Link Here

  Simulator::Run ();

  Simulator::Run ();

  Simulator::Destroy ();

  Simulator::Destroy ();

  Simulator::StopAt (Seconds (10.0));

  Simulator::Stop (Seconds (10.0));

bool

bool




// Private helpers
void Application::ScheduleStart (const Time &startTime)
{
  m_startEvent = Simulator::Schedule (startTime,
                                      &Application::StartApplication, this);
                                     &Application::StartApplication, this);
}

void Application::ScheduleStop (const Time &stopTime)
{
  m_stopEvent = Simulator::Schedule (stopTime,
                                    Simulator::Now(),
                                    &Application::StopApplication, this);
}





{
public:
  static TypeId GetTypeId (void);
  Application ();
  virtual ~Application ();
  
  /**
   * \brief Specify application start time
   * \param startTime Start time for this application,
   *        relative to the current simulation time.
   *
   * Applications start at various times in the simulation scenario.
   * The Start method specifies when the application should be

   * private "StartApplication" method defined below, which is called at the
   * time specified, to cause the application to begin.
   */
  void Start (const Time& startTime);

  /** 
   * \brief Specify application start time.
   * \param startVariable the random variable to use to pick
   *        the real start time as a relative time, in units of
   *        seconds, relative to the current simulation time.
   */
  void Start (const RandomVariable& startVariable);
  
  /**
   * \brief Specify application stop time
   * \param stopTime Stop time for this application, relative to the
   *        current simulation time.
   *
   * Once an application has started, it is sometimes useful
   * to stop the application.  The Stop method specifies when an

   * the private StopApplication method, to be notified when that
   * time has come.
   */
  void Stop (const Time& stopTime);

  /**
   * \brief Specify application stop time
   * \param stopVariable the random variable to use to pick
   *        the real stop time, in units of seconds, 
   *        relative to the current simulation time.
   */
  void Stop (const RandomVariable& stopVariable);

  /**
   * \returns the Node to which this Application object is attached.
   */
  Ptr<Node> GetNode () const;

  /**
   * \param node the node to which this Application object is attached.




  bool IsFinished (void) const;
  Time Next (void) const;
  void Stop (void);
  void Stop (Time const &time);
  EventId Schedule (Time const &time, const Ptr<EventImpl> &event);
  EventId ScheduleNow (const Ptr<EventImpl> &event);
  EventId ScheduleDestroy (const Ptr<EventImpl> &event);

  m_stop = true;
}
void 
SimulatorPrivate::Stop (Time const &time)
{
  NS_ASSERT (time.IsPositive ());
  Time absolute = Simulator::Now () + time;
  m_stopAt = absolute.GetTimeStep ();
}
EventId
SimulatorPrivate::Schedule (Time const &time, const Ptr<EventImpl> &event)

  GetPriv ()->Stop ();
}
void 
Simulator::Stop (Time const &time)
{
  GetPriv ()->Stop (time);
}
Time
Simulator::Now (void)

  Simulator::Destroy ();

  Simulator::Schedule (Seconds (10.0), &SimulatorTests::baz1, this, 0);
  Simulator::Stop (Seconds (1.0));
  Simulator::Run ();
  Simulator::Destroy ();





   */
  static void Stop (void);
  /**
   * Force the Simulator::run method to return to the caller when the
   * expiration time of the next event to be processed is greater than
   * or equal to the stop time.  The stop time is relative to the
   * current simulation time.
   * @param time the stop time, relative to the current time.
   */
  static void Stop (Time const &time);

  /**
   * Schedule an event to expire when the time "now + time" 

Return to bug 191