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

(-)a/src/simulator/default-simulator-impl.h (-1 / +1 lines)
 Lines 56-61    Link Here 
56 
  void Cancel (const EventId &ev);
 56 
  void Cancel (const EventId &ev);
57 
  bool IsExpired (const EventId &ev) const;
 57 
  bool IsExpired (const EventId &ev) const;
58 
  void Run (void);
 58 
  void Run (void);
59 
  void ProcessOneEvent (void);
59 
  Time Now (void) const;
 60 
  Time Now (void) const;
60 
  Time GetDelayLeft (const EventId &id) const;
 61 
  Time GetDelayLeft (const EventId &id) const;
61 
  Time GetMaximumSimulationTime (void) const;
 62 
  Time GetMaximumSimulationTime (void) const;
 Lines 64-70    Link Here 
64 
  Ptr<Scheduler> GetScheduler (void) const;
 65 
  Ptr<Scheduler> GetScheduler (void) const;
65 

          66
          

        

        

          66
          
private:

          67
          
private:

        

            

              67
              
  void ProcessOneEvent (void);

              
              
            

        

          68
          
  uint64_t NextTs (void) const;

          68
          
  uint64_t NextTs (void) const;

        

        

          69
          

          69
          

        

        

          70
          
  typedef std::list<EventId> DestroyEvents;

          70
          
  typedef std::list<EventId> DestroyEvents;

        



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




  

    

    

       Lines 49-54
       
    
  Link Here 
    

  

        

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

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

        

        

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

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

        

        

          51
          
  virtual void Run (void) = 0;

          51
          
  virtual void Run (void) = 0;

        

            

              
              
              52
              
  virtual void ProcessOneEvent (void) = 0;

            

        

          52
          
  virtual Time Now (void) const = 0;

          53
          
  virtual Time Now (void) const = 0;

        

        

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

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

        

        

          54
          
  virtual Time GetMaximumSimulationTime (void) const = 0;

          55
          
  virtual Time GetMaximumSimulationTime (void) const = 0;

        



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




  

    

    

       Lines 143-148
       
    
  Link Here 
    

  

        

          143
          
{

          143
          
{

        

        

          144
          
  NS_LOG_FUNCTION_NOARGS ();

          144
          
  NS_LOG_FUNCTION_NOARGS ();

        

        

          145
          
  GetImpl ()->Run ();

          145
          
  GetImpl ()->Run ();

        

            

              
              
              146
              
}

            

            

              147
              

            

            

              148
              
void 

            

            

              149
              
Simulator::ProcessOneEvent (void)

            

            

              150
              
{

            

            

              151
              
  NS_LOG_FUNCTION_NOARGS ();

            

            

              152
              
  GetImpl ()->ProcessOneEvent ();

            

        

          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 ProcessOneEvent (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