Attachment #220 for bug #270

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

(-)a/bindings/python/ns3_module_simulator.py (+15 lines)

Lines 367-372	Link Here

367

                   'void',

367

                   'void',

368

[],

368

[],

369

                   is_static=True, unblock_threads=True)

369

                   is_static=True, unblock_threads=True)

370

    ## simulator.h: static void ns3::Simulator::RunOneEvent() [member function]

371

    cls.add_method('RunOneEvent',

372

                   'void',

373

[],

374

                   is_static=True)

370

    ## simulator.h: static void ns3::Simulator::Stop() [member function]

375

    ## simulator.h: static void ns3::Simulator::Stop() [member function]

371

    cls.add_method('Stop',

376

    cls.add_method('Stop',

372

                   'void',

377

                   'void',

Lines 669-674	Link Here

669

                   'void',

674

                   'void',

670

[],

675

[],

671

                   is_pure_virtual=True, is_virtual=True)

676

                   is_pure_virtual=True, is_virtual=True)

677

    ## simulator-impl.h: void ns3::SimulatorImpl::RunOneEvent() [member function]

678

    cls.add_method('RunOneEvent',

679

                   'void',

680

[],

681

                   is_pure_virtual=True, is_virtual=True)

672

    ## simulator-impl.h: ns3::Time ns3::SimulatorImpl::Now() const [member function]

682

    ## simulator-impl.h: ns3::Time ns3::SimulatorImpl::Now() const [member function]

673

    cls.add_method('Now',

683

    cls.add_method('Now',

674

                   'ns3::Time',

684

                   'ns3::Time',

Lines 762-767	Link Here

762

                   is_const=True, is_virtual=True)

772

                   is_const=True, is_virtual=True)

763

    ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Run() [member function]

773

    ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Run() [member function]

764

    cls.add_method('Run',

774

    cls.add_method('Run',

775

                   'void',

776

[],

777

                   is_virtual=True)

778

    ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::RunOneEvent() [member function]

779

    cls.add_method('RunOneEvent',

765

                   'void',

780

                   'void',

766

[],

781

[],

767

                   is_virtual=True)

782

                   is_virtual=True)

(-)a/src/simulator/default-simulator-impl.cc (+6 lines)

Lines 154-159	Link Here

154

  // If the simulator stopped naturally by lack of events, make a

154

  // If the simulator stopped naturally by lack of events, make a

155

  // consistency test to check that we didn't lose any events along the way.

155

  // consistency test to check that we didn't lose any events along the way.

156

  NS_ASSERT(!m_events->IsEmpty () || m_unscheduledEvents == 0);

156

  NS_ASSERT(!m_events->IsEmpty () || m_unscheduledEvents == 0);

157

158

159

void

160

DefaultSimulatorImpl::RunOneEvent (void)

161

162

  ProcessOneEvent ();

157

163

158

164

159

void

165

void

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

Lines 55-60	Link Here

  virtual void Cancel (const EventId &ev);

  virtual void Cancel (const EventId &ev);

  virtual bool IsExpired (const EventId &ev) const;

  virtual bool IsExpired (const EventId &ev) const;

  virtual void Run (void);

  virtual void Run (void);

  virtual void RunOneEvent (void);

  virtual Time Now (void) const;

  virtual Time Now (void) const;

  virtual Time GetDelayLeft (const EventId &id) const;

  virtual Time GetDelayLeft (const EventId &id) const;

  virtual Time GetMaximumSimulationTime (void) const;

  virtual Time GetMaximumSimulationTime (void) const;

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

Lines 49-54	Link Here

  virtual void Cancel (const EventId &ev) = 0;

  virtual void Cancel (const EventId &ev) = 0;

  virtual bool IsExpired (const EventId &ev) const = 0;

  virtual bool IsExpired (const EventId &ev) const = 0;

  virtual void Run (void) = 0;

  virtual void Run (void) = 0;

  virtual void RunOneEvent (void) = 0;

  virtual Time Now (void) const = 0;

  virtual Time Now (void) const = 0;

  virtual Time GetDelayLeft (const EventId &id) const = 0;

  virtual Time GetDelayLeft (const EventId &id) const = 0;

  virtual Time GetMaximumSimulationTime (void) const = 0;

  virtual Time GetMaximumSimulationTime (void) const = 0;

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

Lines 143-148	Link Here

143

144

  NS_LOG_FUNCTION_NOARGS ();

144

  NS_LOG_FUNCTION_NOARGS ();

145

  GetImpl ()->Run ();

145

  GetImpl ()->Run ();

146

147

148

void

149

Simulator::RunOneEvent (void)

150

151

  NS_LOG_FUNCTION_NOARGS ();

152

  GetImpl ()->RunOneEvent ();

146

153

147

154

148

void

155

void

(-)a/src/simulator/simulator.h (+5 lines)

Lines 115-120	Link Here

115

   *     is greater than or equal to the stop time.

115

   *     is greater than or equal to the stop time.

116

*/

116

*/

117

  static void Run (void);

117

  static void Run (void);

118

119

/**

120

   * Process only the next simulation event, then return immediately.

121

*/

122

  static void RunOneEvent (void);

118

123

119

/**

124

/**

120

   * If an event invokes this method, it will be the last

125

   * If an event invokes this method, it will be the last

Return to bug 270