Attachment #2667 for bug #2547

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




}

void
TcpIllinois::SlowStart (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked)
{
  NS_LOG_FUNCTION (this << segmentsAcked);


      Reset (tcb->m_nextTxSequence);
    }

  TcpNewReno::SlowStart (tcb, segmentsAcked);
}

void
TcpIllinois::CongestionAvoidance (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked)
{
  NS_LOG_FUNCTION (this << segmentsAcked);

  uint32_t segCwnd = tcb->GetCwndInSegments ();
  uint32_t oldCwnd = segCwnd;

  if (segmentsAcked > 0)
    {
      m_ackCnt += segmentsAcked * m_alpha;
    }

  while (m_ackCnt >= segCwnd)
    {
      m_ackCnt -= segCwnd;
      segCwnd += 1;
    }

  if (segCwnd != oldCwnd)
    {
      tcb->m_cWnd = segCwnd * tcb->m_segmentSize;
      NS_LOG_INFO ("In CongAvoid, updated to cwnd " << tcb->m_cWnd <<
                   " ssthresh " << tcb->m_ssThresh);
    }
  else
    {
      uint32_t segCwnd = tcb->GetCwndInSegments ();
      uint32_t oldCwnd = segCwnd;

      if (segmentsAcked > 0)
        {
          m_ackCnt += segmentsAcked * m_alpha;
        }

      while (m_ackCnt >= segCwnd)
        {
          m_ackCnt -= segCwnd;
          segCwnd += 1;
        }

      if (segCwnd != oldCwnd)
        {
          tcb->m_cWnd = segCwnd * tcb->m_segmentSize;
          NS_LOG_INFO ("In CongAvoid, updated to cwnd " << tcb->m_cWnd <<
                       " ssthresh " << tcb->m_ssThresh);
        }
    }
}

void




    */
  virtual void CongestionStateSet (Ptr<TcpSocketState> tcb,
                                   const TcpSocketState::TcpCongState_t newState);

  /**
   * \brief Adjust cwnd following Illinois congestion avoidance algorithm
   *
   * \param tcb internal congestion state
   * \param segmentsAcked count of segments ACKed
   */
  virtual void IncreaseWindow (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked);

  /**
   * \brief Measure RTT for each ACK
   * Keep track of min and max RTT

                          const Time& rtt);

protected:
  virtual void CongestionAvoidance (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked);
  virtual void SlowStart (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked);

private:
  /**
   * \brief Recalculate alpha and beta every RTT

(-)i/src/internet/model/tcp-vegas.cc (-2 / +2 lines)

Lines 233-239 TcpVegas::IncreaseWindow (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked)	Link Here

233

            {     // Slow start mode

233

            {     // Slow start mode

234

              NS_LOG_LOGIC ("We are in slow start and diff < m_gamma, so we "

234

              NS_LOG_LOGIC ("We are in slow start and diff < m_gamma, so we "

235

                            "follow NewReno slow start");

235

                            "follow NewReno slow start");

236

              segmentsAcked = TcpNewReno::SlowStart (tcb, segmentsAcked);

236

              TcpNewReno::SlowStart (tcb, segmentsAcked);

237

238

          else

238

          else

239

            {     // Linear increase/decrease mode

239

            {     // Linear increase/decrease mode

Lines 274-280 TcpVegas::IncreaseWindow (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked)	Link Here

274

275

  else if (tcb->m_cWnd < tcb->m_ssThresh)

275

  else if (tcb->m_cWnd < tcb->m_ssThresh)

276

277

      segmentsAcked = TcpNewReno::SlowStart (tcb, segmentsAcked);

277

      TcpNewReno::SlowStart (tcb, segmentsAcked);

278

279

280

(-)i/src/internet/model/tcp-veno.cc (-1 / +1 lines)

Lines 192-198 TcpVeno::IncreaseWindow (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked)	Link Here

192

      if (tcb->m_cWnd < tcb->m_ssThresh)

192

      if (tcb->m_cWnd < tcb->m_ssThresh)

193

        { // Slow start mode. Veno employs same slow start algorithm as NewReno's.

193

        { // Slow start mode. Veno employs same slow start algorithm as NewReno's.

194

          NS_LOG_LOGIC ("We are in slow start, behave like NewReno.");

194

          NS_LOG_LOGIC ("We are in slow start, behave like NewReno.");

195

          segmentsAcked = TcpNewReno::SlowStart (tcb, segmentsAcked);

195

          TcpNewReno::SlowStart (tcb, segmentsAcked);

196

197

      else

197

      else

198

        { // Congestion avoidance mode

198

        { // Congestion avoidance mode




}

void
TcpYeah::CongestionAvoidance (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked)
{
  NS_LOG_FUNCTION (this << tcb << segmentsAcked);

  if (!m_doingRenoNow)
    {
      NS_LOG_LOGIC ("In slow start, invoke NewReno slow start.");
      segmentsAcked = TcpNewReno::SlowStart (tcb, segmentsAcked);
    }
  else if (!m_doingRenoNow)
    { // Fast mode
      NS_LOG_LOGIC ("In Fast mode, increment cwnd according to STCP rule.");
      m_stcp->IncreaseWindow (tcb, segmentsAcked);




                                   const TcpSocketState::TcpCongState_t newState);

  /**
   * \brief Adjust cwnd following YeAH dual-mode algorithm
   *
   * \param tcb internal congestion state
   * \param segmentsAcked count of segments ACKed
   */
  virtual void IncreaseWindow (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked);

  /**
   * \brief Get slow start threshold upon the receipt of 3 dupACKs
   *
   * \param tcb internal congestion state

  virtual Ptr<TcpCongestionOps> Fork ();

protected:
  virtual void CongestionAvoidance (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked);

private:
  /**
   * \brief Enable YeAH algorithm to start taking YeAH samples

Return to bug 2547