Attachment #2729 for bug #2604

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

(-)a/src/wifi/model/dca-txop.cc (-1 / +1 lines)

Lines 116-122	Link Here

116

117

    m_txop->StartNextFragment ();

117

    m_txop->StartNextFragment ();

118

119

  virtual void StartNext (void)

119

  virtual void StartNextPacket (void)

120

121

122

  virtual void Cancel (void)

122

  virtual void Cancel (void)




  {
    m_txop->StartNextFragment ();
  }
  virtual void StartNextPacket (void)
  {
    m_txop->StartNextPacket ();
  }
  virtual void Cancel (void)
  {

}

void
EdcaTxopN::StartNextPacket (void)
{
  NS_LOG_FUNCTION (this);
  Time txopLimit = GetTxopLimit ();
  NS_ASSERT (txopLimit == NanoSeconds (0) || Simulator::Now () - m_startTxop <= txopLimit);
  WifiMacHeader hdr = m_currentHdr;
  Time tstamp;
  Ptr<const Packet> peekedPacket = m_baManager->GetNextPacket (hdr);
                                                                 m_currentHdr.GetQosTid (),
                                                                 WifiMacHeader::ADDR1,
                                                                 m_currentHdr.GetAddr1 (),
                                                                 &tstamp);
  if (peekedPacket == 0)
    {
      peekedPacket = m_queue->PeekByTidAndAddress (&hdr,
                                                   m_currentHdr.GetQosTid (),
                                                   WifiMacHeader::ADDR1,
                                                   m_currentHdr.GetAddr1 (),
                                                   &tstamp);
    }
  if ((m_currentHdr.IsQosBlockAck () && peekedPacket == 0) || m_baManager->HasBar (m_currentBar))
    {
      SendBlockAckRequest (m_currentBar);
      return;
    }
  else if (peekedPacket == 0)
    {
      if (txopLimit > NanoSeconds (0))
        {
          NS_ASSERT (Simulator::Now () - m_startTxop <= txopLimit);

        }
      return;
    }
    
  MacLowTransmissionParameters params;
  params.DisableOverrideDurationId ();
  params.DisableNextData ();
  if (m_currentHdr.IsQosData () && m_currentHdr.IsQosBlockAck ())
    {
      params.DisableAck ();

    {
      params.EnableAck ();
    }
    
  WifiTxVector dataTxVector = m_stationManager->GetDataTxVector (m_currentHdr.GetAddr1 (), &m_currentHdr, peekedPacket);
  if (m_stationManager->NeedRts (m_currentHdr.GetAddr1 (), &m_currentHdr, peekedPacket, dataTxVector))
    {
      params.EnableRts ();
    }
  else
    {
      params.DisableRts ();
    }

  if (txopLimit >= GetLow ()->CalculateOverallTxTime (peekedPacket, &hdr, params))
    {
      NS_LOG_DEBUG ("start next packet");

                                                         m_currentHdr.GetQosTid (),
                                                         WifiMacHeader::ADDR1,
                                                         m_currentHdr.GetAddr1 ());
      m_currentHdr = hdr;
      NS_ASSERT (m_currentPacket != 0);
      uint16_t sequence = m_txMiddle->GetNextSequenceNumberfor (&m_currentHdr);
      m_currentHdr.SetSequenceNumber (sequence);
      m_stationManager->UpdateFragmentationThreshold ();
      m_currentHdr.SetFragmentNumber (0);
      m_currentHdr.SetNoMoreFragments ();
      m_currentHdr.SetNoRetry ();
      m_fragmentNumber = 0;
      VerifyBlockAck ();
      GetLow ()->StartTransmission (m_currentPacket, &m_currentHdr, params, m_transmissionListener);
      if (!GetAmpduExist (m_currentHdr.GetAddr1 ()))
        {
          CompleteTx ();
        }
    }
  else if (txopLimit > NanoSeconds (0))
    {

      params.EnableAck ();
    }

  Time duration = GetLow ()->CalculateOverallTxTime (peekedPacket, &hdr, params);
  if (m_currentPacket != 0)
    {
      //take into account current transmission in duration
      duration += GetLow ()->CalculateOverallTxTime (m_currentPacket, &m_currentHdr, params);
    }
  return (GetTxopRemaining () >= duration);
    {
      params.DisableRts ();
    }

  return (GetTxopRemaining () >= GetLow ()->CalculateOverallTxTime (peekedPacket, &hdr, params));
}

void

{
  NS_LOG_FUNCTION (this);
  NS_LOG_DEBUG ("a transmission that did not require an ACK just finished");
  if (m_currentHdr.IsQosData ()  && m_currentHdr.IsQosBlockAck () && GetTxopLimit () > NanoSeconds (0))
    {
      m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
    }
  m_currentPacket = 0;
  m_dcf->ResetCw ();
  m_cwTrace = m_dcf->GetCw ();

    }
  m_currentPacket = 0;
  m_dcf->ResetCw ();
  if (!HasTxop ())
    {
      if (m_currentHdr.IsQosData () && GetTxopLimit () > NanoSeconds (0))
        {
          m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
        }
      m_cwTrace = m_dcf->GetCw ();
      m_backoffTrace = m_rng->GetNext (0, m_dcf->GetCw ());
      m_dcf->StartBackoffNow (m_backoffTrace);
      RestartAccessIfNeeded ();
    }
}

void

(-)a/src/wifi/model/edca-txop-n.h (-1 / +1 lines)

Lines 277-283	Link Here

277

/**

277

/**

278

   * Start transmission for the next packet if allowed by the TxopLimit.

278

   * Start transmission for the next packet if allowed by the TxopLimit.

279

*/

279

*/

280

  void StartNext (void);

280

  void StartNextPacket (void);

281

/**

281

/**

282

   * Cancel the transmission.

282

   * Cancel the transmission.

283

*/

283

*/

(-)a/src/wifi/model/mac-low.cc (-5 / +16 lines)

Lines 1013-1022	Link Here

1013

          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

1013

          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

1014

                                                 &MacLow::WaitSifsAfterEndTxFragment, this);

1014

                                                 &MacLow::WaitSifsAfterEndTxFragment, this);

1015

1016

      else if (m_currentHdr.IsQosData () && !m_ampdu && m_listener->HasTxop ())

1016

      else if (m_currentHdr.IsQosData () && m_listener->HasTxop ())

1017

1018

          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

1018

          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

1019

                                                 &MacLow::WaitSifsAfterEndTx, this);

1019

                                                 &MacLow::WaitSifsAfterEndTxPacket, this);

1020

1021

      m_ampdu = false;

1021

      m_ampdu = false;

1022

      if (m_currentHdr.IsQosData ())

1022

      if (m_currentHdr.IsQosData ())

Lines 1037-1042	Link Here

1037

      m_blockAckTimeoutEvent.Cancel ();

1037

      m_blockAckTimeoutEvent.Cancel ();

1038

      NotifyAckTimeoutResetNow ();

1038

      NotifyAckTimeoutResetNow ();

1039

      m_listener->GotBlockAck (&blockAck, hdr.GetAddr2 (), rxSnr, txVector.GetMode (), tag.Get ());

1039

      m_listener->GotBlockAck (&blockAck, hdr.GetAddr2 (), rxSnr, txVector.GetMode (), tag.Get ());

1040

      if (m_currentHdr.IsQosData () && m_listener->HasTxop ())

1041

1042

          m_waitSifsEvent = Simulator::Schedule (GetSifs (),

1043

                                                 &MacLow::WaitSifsAfterEndTxPacket,

1044

                                                 this);

1045

1040

      m_ampdu = false;

1046

      m_ampdu = false;

1041

1047

1042

  else if (hdr.IsBlockAckReq () && hdr.GetAddr1 () == m_self)

1048

  else if (hdr.IsBlockAckReq () && hdr.GetAddr1 () == m_self)

Lines 1383-1391	Link Here

1383

  WifiTxVector dataTxVector = GetDataTxVector (packet, hdr);

1389

  WifiTxVector dataTxVector = GetDataTxVector (packet, hdr);

1384

  uint32_t dataSize = GetSize (packet, hdr);

1390

  uint32_t dataSize = GetSize (packet, hdr);

1385

  txTime += m_phy->CalculateTxDuration (dataSize, dataTxVector, m_phy->GetFrequency ());

1391

  txTime += m_phy->CalculateTxDuration (dataSize, dataTxVector, m_phy->GetFrequency ());

1392

  txTime += GetSifs ();

1386

  if (params.MustWaitAck ())

1393

  if (params.MustWaitAck ())

1387

1394

1388

      txTime += GetSifs ();

1389

      txTime += GetAckDuration (hdr->GetAddr1 (), dataTxVector);

1395

      txTime += GetAckDuration (hdr->GetAddr1 (), dataTxVector);

1390

1396

1391

  return txTime;

1397

  return txTime;

Lines 1843-1848	Link Here

1843

          m_waitSifsEvent = Simulator::Schedule (delay, &MacLow::WaitSifsAfterEndTxFragment, this);

1849

          m_waitSifsEvent = Simulator::Schedule (delay, &MacLow::WaitSifsAfterEndTxFragment, this);

1844

1850

1845

1851

1852

  else if (m_currentHdr.IsQosData () && m_currentHdr.IsQosBlockAck () && m_listener->HasTxop ())

1853

1854

      Time delay = txDuration + GetSifs ();

1855

      m_waitSifsEvent = Simulator::Schedule (delay, &MacLow::WaitSifsAfterEndTxPacket, this);

1856

1846

  else

1857

  else

1847

1858

1848

      // since we do not expect any timer to be triggered.

1859

      // since we do not expect any timer to be triggered.

Lines 2119-2127	Link Here

2119

2130

2120

2131

2121

void

2132

void

2122

MacLow::WaitSifsAfterEndTx (void)

2133

MacLow::WaitSifsAfterEndTxPacket (void)

2123

2134

2124

  m_listener->StartNext ();

2135

  m_listener->StartNextPacket ();

2125

2136

2126

2137

2127

void

2138

void




  virtual void StartNextFragment (void) = 0;
  /**
   * Invoked when ns3::MacLow wants to continue the TXOP.
   * The listener is expected to call again MacLow::StartTransmission with the "next" packet to send.
   * with the "next" packet to send.
   */
  virtual void StartNextPacket (void) = 0;
  /**
   * Invoked if this transmission was canceled
   * one way or another. When this method is invoked,

   * after completing transmissions.
   */
  void WaitSifsAfterEndTxFragment (void);
  void WaitSifsAfterEndTxPacket (void);

  /**
   * A transmission that does not require an ACK has completed.

Return to bug 2604