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

(-)a/src/traffic-control/model/red-queue-disc.cc (+2 lines)
 Lines 571-576    Link Here 
571 
void
 571 
void
572 
RedQueueDisc::UpdateMaxP (double newAve, Time now)
 572 
RedQueueDisc::UpdateMaxP (double newAve, Time now)
573 
{
 573 
{
574 
  NS_LOG_FUNCTION (this << newAve << now);
575 

            

        

          574
          
  double m_part = 0.4 * (m_maxTh - m_minTh);

          576
          
  double m_part = 0.4 * (m_maxTh - m_minTh);

        

        

          575
          
  // AIMD rule to keep target Q~1/2(m_minTh + m_maxTh)

          577
          
  // AIMD rule to keep target Q~1/2(m_minTh + m_maxTh)

        

        

          576
          
  if (newAve < m_minTh + m_part && m_curMaxP > m_bottom)

          578
          
  if (newAve < m_minTh + m_part && m_curMaxP > m_bottom)

        



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




  

    

    

       Lines 66-72
       
    
  Link Here 
    

  

        

          66
          
#include "ns3/nstime.h"

          66
          
#include "ns3/nstime.h"

        

        

          67
          
#include "ns3/boolean.h"

          67
          
#include "ns3/boolean.h"

        

        

          68
          
#include "ns3/data-rate.h"

          68
          
#include "ns3/data-rate.h"

        

            

              69
              
#include "ns3/nstime.h"

              
              
            

        

          70
          
#include "ns3/random-variable-stream.h"

          69
          
#include "ns3/random-variable-stream.h"

        

        

          71
          

          70
          

        

        

          72
          
namespace ns3 {

          71
          
namespace ns3 {

        

  

    

    

       Lines 320-327
       
    
  Link Here 
    

  

        

          320
          
  uint32_t m_count;         //!< Number of packets since last random number generation

          319
          
  uint32_t m_count;         //!< Number of packets since last random number generation

        

        

          321
          
  /**

          320
          
  /**

        

        

          322
          
   * 0 for default RED

          321
          
   * 0 for default RED

        

          
            

              323
              
   * 1 experimental (see red-queue.cc)


              322
              
   * 1 experimental (see red-queue-disc.cc)

            

            

              324
              
   * 2 experimental (see red-queue.cc)


              323
              
   * 2 experimental (see red-queue-disc.cc)

            

        

          325
          
   * 3 use Idle packet size in the ptc

          324
          
   * 3 use Idle packet size in the ptc

        

        

          326
          
   */

          325
          
   */

        

        

          327
          
  uint32_t m_cautious;

          326
          
  uint32_t m_cautious;

        






  

  Return to bug 2590