Attachment #3224 for bug #3010

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

(-)a/examples/wireless/examples-to-run.py (-1 / +2 lines)

Lines 43-49 cpp_examples = [	Link Here

    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=1 --minExpectedThroughput=4.5 --maxExpectedThroughput=128", "True", "True"),

    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=1 --minExpectedThroughput=4.5 --maxExpectedThroughput=128", "True", "True"),

    ("vht-wifi-network --simulationTime=0.1 --useRts=0  --minExpectedThroughput=5 --maxExpectedThroughput=607", "True", "True"),

    ("vht-wifi-network --simulationTime=0.1 --useRts=0  --minExpectedThroughput=5 --maxExpectedThroughput=607", "True", "True"),

    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),

    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0  --minExpectedThroughput=6 --maxExpectedThroughput=844", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=844", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0 --useExtendedBlockAck=1 --minExpectedThroughput=6 --maxExpectedThroughput=1033", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=745", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=745", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),

(-)a/src/wifi/model/block-ack-manager.cc (-1 lines)

Lines 518-524 BlockAckManager::AlreadyExists (uint16_t currentSeq, Mac48Address recipient, uin	Link Here

518

  std::list<PacketQueueI>::const_iterator it = m_retryPackets.begin ();

518

  std::list<PacketQueueI>::const_iterator it = m_retryPackets.begin ();

519

  while (it != m_retryPackets.end ())

519

  while (it != m_retryPackets.end ())

520

521

      NS_LOG_FUNCTION (this << (*it)->hdr.GetType ());

522

      if (!(*it)->hdr.IsQosData ())

521

      if (!(*it)->hdr.IsQosData ())

523

522

524

          NS_FATAL_ERROR ("Packet in blockAck manager retry queue is not Qos Data");

523

          NS_FATAL_ERROR ("Packet in blockAck manager retry queue is not Qos Data");




      //In that case, we transmit the same A-MPDU as previously.
      uint32_t sentMpdus = m_aggregateQueue[GetTid (packet, *hdr)]->GetNPackets ();
      m_ampdu = true;
      if (sentMpdus > 1)
        {
          AcIndex ac = QosUtilsMapTidToAc (GetTid (packet, *hdr));
          std::map<AcIndex, Ptr<QosTxop> >::const_iterator edcaIt = m_edca.find (ac);
          if (edcaIt->second->GetBaBufferSize (m_currentHdr.GetAddr1 (), m_currentHdr.GetQosTid ()) > 64)
            {
              m_txParams.EnableExtendedCompressedBlockAck ();
            }
          else
            {
              m_txParams.EnableCompressedBlockAck ();
            }
        }
      else if (m_currentHdr.IsQosData ())
        {

        {
          AmpduTag ampdu;
          m_currentPacket->PeekPacketTag (ampdu);
          if (ampdu.GetRemainingNbOfMpdus () > 0)
            {
              m_txParams.EnableExtendedCompressedBlockAck ();
            }
          else if (ampdu.GetRemainingNbOfMpdus () > 0)
            {
              AcIndex ac = QosUtilsMapTidToAc (GetTid (packet, *hdr));
              std::map<AcIndex, Ptr<QosTxop> >::const_iterator edcaIt = m_edca.find (ac);
              if (edcaIt->second->GetBaBufferSize (m_currentHdr.GetAddr1 (), m_currentHdr.GetQosTid ()) > 64)
                {
                  m_txParams.EnableExtendedCompressedBlockAck ();
                }
              else 
                {
                  m_txParams.EnableCompressedBlockAck ();
                }
            }
          else if (m_currentHdr.IsQosData ())
            {

      (*it).second.second.erase ((*it).second.second.begin (), lastComplete);
    }
}

void
MacLow::SendBlockAckResponse (const CtrlBAckResponseHeader* blockAck, Mac48Address originator, bool immediate,
                              Time duration, WifiMode blockAckReqTxMode, double rxSnr)

}

void
MacLow::SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator, Time duration, WifiTxVector blockAckReqTxVector, double rxSnr)
{
  NS_LOG_FUNCTION (this);
  if (!m_phy->IsStateTx () && !m_phy->IsStateRx ())

      blockAck.SetStartingSequence (seqNumber);
      blockAck.SetTidInfo (tid);
      immediate = (*it).second.first.IsImmediateBlockAck ();
      if ((*it).second.first.GetBufferSize () > 64)
        {
          blockAck.SetType (EXTENDED_COMPRESSED_BLOCK_ACK);
        }

      NS_LOG_DEBUG ("Got Implicit block Ack Req with seq " << seqNumber);
      (*i).second.FillBlockAckBitmap (&blockAck);

      WifiTxVector blockAckTxVector = GetBlockAckTxVector (originator, blockAckReqTxVector.GetMode ());

      SendBlockAckResponse (&blockAck, originator, immediate, duration, blockAckTxVector.GetMode (), rxSnr);
    }
  else
    {

                                                    firsthdr.GetQosTid (),
                                                    firsthdr.GetAddr2 (),
                                                    firsthdr.GetDuration (),
                                                    txVector, rxSnr);
                                                    ampdu.GetRemainingNbOfMpdus () + 1);
            }

          if (firsthdr.IsAck () || firsthdr.IsBlockAck () || firsthdr.IsBlockAckReq ())

(-)a/src/wifi/model/mac-low.h (-2 / +1 lines)

Lines 801-810 private:	Link Here

801

   * \param duration the remaining NAV duration

801

   * \param duration the remaining NAV duration

802

   * \param blockAckReqTxVector the transmit vector

802

   * \param blockAckReqTxVector the transmit vector

803

   * \param rxSnr the receive SNR

803

   * \param rxSnr the receive SNR

804

   * \param nMpdus the number of received MPDUs

805

*/

804

*/

806

  void SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator, Time duration,

805

  void SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator, Time duration,

807

                               WifiTxVector blockAckReqTxVector, double rxSnr, uint8_t nMpdus);

806

                               WifiTxVector blockAckReqTxVector, double rxSnr);

808

/**

807

/**

809

   * This method creates block ack frame with header equals to <i>blockAck</i> and start its transmission.

808

   * This method creates block ack frame with header equals to <i>blockAck</i> and start its transmission.

810

809




            {
              NS_LOG_DEBUG ("Transmit Block Ack Request");
              CtrlBAckRequestHeader reqHdr;
              reqHdr.SetType (GetBaBufferSize (m_currentHdr.GetAddr1 (), tid) > 64 ? EXTENDED_COMPRESSED_BLOCK_ACK : COMPRESSED_BLOCK_ACK);
              reqHdr.SetStartingSequence (m_txMiddle->PeekNextSequenceNumberFor (&m_currentHdr));
              reqHdr.SetTidInfo (tid);
              reqHdr.SetHtImmediateAck (true);

              //send Block ACK Request in order to shift WinStart at the receiver
              NS_LOG_DEBUG ("Transmit Block Ack Request");
              CtrlBAckRequestHeader reqHdr;
              reqHdr.SetType (GetBaBufferSize (m_currentHdr.GetAddr1 (), tid) > 64 ? EXTENDED_COMPRESSED_BLOCK_ACK : COMPRESSED_BLOCK_ACK);
              reqHdr.SetStartingSequence (m_txMiddle->PeekNextSequenceNumberFor (&m_currentHdr));
              reqHdr.SetTidInfo (tid);
              reqHdr.SetHtImmediateAck (true);

          //standard says when losing a BlockAck originator may send a BAR page 139
          NS_LOG_DEBUG ("Transmit Block Ack Request");
          CtrlBAckRequestHeader reqHdr;
          reqHdr.SetType (GetBaBufferSize (m_currentHdr.GetAddr1 (), tid) > 64 ? EXTENDED_COMPRESSED_BLOCK_ACK : COMPRESSED_BLOCK_ACK);
          if (m_currentHdr.IsQosData ())
            {
              reqHdr.SetStartingSequence (m_currentHdr.GetSequenceNumber ());

        }
      else if (m_blockAckType == COMPRESSED_BLOCK_ACK)
        {
          if (GetBaBufferSize (m_currentHdr.GetAddr1 (), GetTid (m_currentPacket, m_currentHdr)) > 64)
            {
              m_currentParams.EnableExtendedCompressedBlockAck ();
            }
          else
            {
              m_currentParams.EnableCompressedBlockAck ();
            }
        }
      else if (m_blockAckType == MULTI_TID_BLOCK_ACK)
        {

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

Lines 415-420 WifiMac::Configure80211ax_5Ghz (void)	Link Here

415

416

  NS_LOG_FUNCTION (this);

416

  NS_LOG_FUNCTION (this);

417

  Configure80211ac ();

417

  Configure80211ac ();

418

  SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + MicroSeconds (85) + GetDefaultMaxPropagationDelay () * 2);

418

419

420

void

421

void

Return to bug 3010