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

(-)a/CHANGES.html (+1 lines)
 Lines 93-98    Link Here 
93 
  <li>QueueDisc::DequeuePeeked has been merged into QueueDisc::Dequeue and hence no longer exists.</li>
 93 
  <li>QueueDisc::DequeuePeeked has been merged into QueueDisc::Dequeue and hence no longer exists.</li>
94 
  <li>The QueueDisc base class now provides a default implementation of the DoPeek private method
 94 
  <li>The QueueDisc base class now provides a default implementation of the DoPeek private method
95 
  based on the QueueDisc::PeekDequeue method, which is now no longer available.</li>
 95 
  based on the QueueDisc::PeekDequeue method, which is now no longer available.</li>
96 
  <li>The QueueDisc::SojournTime trace source is changed from a TracedValue to a TracedCallback; callbacks that hook this trace must provide one ns3::Time argument, not two.</li>
96 
</ul>
 97 
</ul>
97 
<h2>Changes to build system:</h2>
 98 
<h2>Changes to build system:</h2>
98 
<ul>
 99 
<ul>
(-)a/examples/traffic-control/traffic-control.cc (-2 / +2 lines)
 Lines 79-87    Link Here 
79 
}
 79 
}
80 

          80
          

        

        

          81
          
void

          81
          
void

        

          
            

              82
              
SojournTimeTrace (Time oldValue, Time newValue)


              82
              
SojournTimeTrace (Time sojournTime)

            

        

          83
          
{

          83
          
{

        

          
            

              84
              
  std::cout << "Sojourn time " << newValue.ToDouble (Time::MS) << "ms" << std::endl;


              84
              
  std::cout << "Sojourn time " << sojournTime.ToDouble (Time::MS) << "ms" << std::endl;

            

        

          85
          
}

          85
          
}

        

        

          86
          

          86
          

        

        

          87
          
int

          87
          
int

        



(-)a/src/traffic-control/model/queue-disc.cc
      (-3 / +2 lines)




  

    

    

       Lines 317-323
       
    
  Link Here 
    

  

        

          317
          
    .AddTraceSource ("SojournTime",

          317
          
    .AddTraceSource ("SojournTime",

        

        

          318
          
                     "Sojourn time of the last packet dequeued from the queue disc",

          318
          
                     "Sojourn time of the last packet dequeued from the queue disc",

        

        

          319
          
                     MakeTraceSourceAccessor (&QueueDisc::m_sojourn),

          319
          
                     MakeTraceSourceAccessor (&QueueDisc::m_sojourn),

        

          
            

              320
              
                     "ns3::TracedValueCallback::Time")


              320
              
                     "ns3::Time::TracedCallback")

            

        

          321
          
  ;

          321
          
  ;

        

        

          322
          
  return tid;

          322
          
  return tid;

        

        

          323
          
}

          323
          
}

        

  

    

    

       Lines 325-331
       
    
  Link Here 
    

  

        

          325
          
QueueDisc::QueueDisc (QueueDiscSizePolicy policy)

          325
          
QueueDisc::QueueDisc (QueueDiscSizePolicy policy)

        

        

          326
          
  :  m_nPackets (0),

          326
          
  :  m_nPackets (0),

        

        

          327
          
     m_nBytes (0),

          327
          
     m_nBytes (0),

        

            

              328
              
     m_sojourn (0),

              
              
            

        

          329
          
     m_maxSize (QueueSize ("1p")),         // to avoid that setting the mode at construction time is ignored

          328
          
     m_maxSize (QueueSize ("1p")),         // to avoid that setting the mode at construction time is ignored

        

        

          330
          
     m_running (false),

          329
          
     m_running (false),

        

        

          331
          
     m_peeked (false),

          330
          
     m_peeked (false),

        

  

    

    

       Lines 702-708
       
    
  Link Here 
    

  

        

          702
          
      m_stats.nTotalDequeuedPackets++;

          701
          
      m_stats.nTotalDequeuedPackets++;

        

        

          703
          
      m_stats.nTotalDequeuedBytes += item->GetSize ();

          702
          
      m_stats.nTotalDequeuedBytes += item->GetSize ();

        

        

          704
          

          703
          

        

          
            

              705
              
      m_sojourn = Simulator::Now () - item->GetTimeStamp ();


              704
              
      m_sojourn (Simulator::Now () - item->GetTimeStamp ());

            

        

          706
          

          705
          

        

        

          707
          
      NS_LOG_LOGIC ("m_traceDequeue (p)");

          706
          
      NS_LOG_LOGIC ("m_traceDequeue (p)");

        

        

          708
          
      m_traceDequeue (item);

          707
          
      m_traceDequeue (item);

        



(-)a/src/traffic-control/model/queue-disc.h
      (-1 / +2 lines)




  

    

    

       Lines 22-27
       
    
  Link Here 
    

  

        

          22
          

          22
          

        

        

          23
          
#include "ns3/object.h"

          23
          
#include "ns3/object.h"

        

        

          24
          
#include "ns3/traced-value.h"

          24
          
#include "ns3/traced-value.h"

        

            

              
              
              25
              
#include "ns3/traced-callback.h"

            

        

          25
          
#include "ns3/net-device.h"

          26
          
#include "ns3/net-device.h"

        

        

          26
          
#include "ns3/queue-item.h"

          27
          
#include "ns3/queue-item.h"

        

        

          27
          
#include "ns3/queue-size.h"

          28
          
#include "ns3/queue-size.h"

        

  

    

    

       Lines 665-671
       
    
  Link Here 
    

  

        

          665
          

          666
          

        

        

          666
          
  TracedValue<uint32_t> m_nPackets; //!< Number of packets in the queue

          667
          
  TracedValue<uint32_t> m_nPackets; //!< Number of packets in the queue

        

        

          667
          
  TracedValue<uint32_t> m_nBytes;   //!< Number of bytes in the queue

          668
          
  TracedValue<uint32_t> m_nBytes;   //!< Number of bytes in the queue

        

          
            

              668
              
  TracedValue<Time> m_sojourn;      //!< Sojourn time of the latest dequeued packet


              669
              
  TracedCallback<Time> m_sojourn;   //!< Sojourn time of the latest dequeued packet

            

        

          669
          
  QueueSize m_maxSize;              //!< max queue size

          670
          
  QueueSize m_maxSize;              //!< max queue size

        

        

          670
          

          671
          

        

        

          671
          
  Stats m_stats;                    //!< The collected statistics

          672
          
  Stats m_stats;                    //!< The collected statistics

        






  

  Return to bug 2940