Attachment #2416 for bug #2307

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

(-)a/src/test/traced/traced-callback-typedef-test-suite.cc (-2 / +2 lines)

Lines 610-617	Link Here

610

         empty, empty, empty, empty);

610

         empty, empty, empty, empty);

611

612

  CHECK (WifiPhyStateHelper::RxEndErrorTracedCallback,

612

  CHECK (WifiPhyStateHelper::RxEndErrorTracedCallback,

613

         Ptr<const Packet>, double, bool,

613

         Ptr<const Packet>, double,

614

         empty, empty);

614

         empty, empty, empty);

615

616

  CHECK (WifiPhyStateHelper::RxOkTracedCallback,

616

  CHECK (WifiPhyStateHelper::RxOkTracedCallback,

617

         Ptr<const Packet>, double, WifiMode, WifiPreamble,

617

         Ptr<const Packet>, double, WifiMode, WifiPreamble,

(-)a/src/wifi/model/ampdu-tag.cc (-11 / +34 lines)

Lines 15-21	Link Here

 * along with this program; if not, write to the Free Software

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Author: Ghada Badawy <gbadawy@gmail.com>

 * Authors: Ghada Badawy <gbadawy@gmail.com>

 *          Sébastien Deronne <sebastien.deronne@gmail.com>

*/

*/

#include "ampdu-tag.h"

#include "ampdu-tag.h"

Lines 48-54	Link Here

AmpduTag::AmpduTag ()

AmpduTag::AmpduTag ()

  : m_ampdu (0)

  : m_ampdu (0),

    m_nbOfMpdus (0),

    m_duration (Seconds(0))

Lines 59-88	Link Here

void

void

AmpduTag::SetNoOfMpdus (uint8_t noofmpdus)

AmpduTag::SetRemainingNbOfMpdus (uint8_t nbofmpdus)

  NS_ASSERT (noofmpdus <= 64);

  NS_ASSERT (nbofmpdus <= 64);

  m_noOfMpdus = noofmpdus;

  m_nbOfMpdus = nbofmpdus;

void

AmpduTag::SetRemainingAmpduDuration (Time duration)

  NS_ASSERT (m_duration <= MilliSeconds(10));

  m_duration = duration;

uint32_t

uint32_t

AmpduTag::GetSerializedSize (void) const

AmpduTag::GetSerializedSize (void) const

  return 2;

  return (2 + sizeof (Time));

void

void

AmpduTag::Serialize (TagBuffer i) const

AmpduTag::Serialize (TagBuffer i) const

  i.WriteU8 (m_ampdu);

  i.WriteU8 (m_ampdu);

  i.WriteU8 (m_noOfMpdus);

  i.WriteU8 (m_nbOfMpdus);

  int64_t duration = m_duration.GetTimeStep ();

  i.Write ((const uint8_t *)&duration, sizeof(int64_t));

void

void

AmpduTag::Deserialize (TagBuffer i)

AmpduTag::Deserialize (TagBuffer i)

  m_ampdu = i.ReadU8 ();

  m_ampdu = i.ReadU8 ();

  m_noOfMpdus = i.ReadU8 ();

  m_nbOfMpdus = i.ReadU8 ();

  int64_t duration;

  i.Read ((uint8_t *)&duration, 8);

100

  m_duration = Time (duration);

101

102

bool

103

bool

Lines 92-106	Link Here

107

108

uint8_t

109

uint8_t

AmpduTag::GetNoOfMpdus () const

110

AmpduTag::GetRemainingNbOfMpdus () const

111

  return m_noOfMpdus;

112

  return m_nbOfMpdus;

113

114

115

Time

116

AmpduTag::GetRemainingAmpduDuration () const

117

118

  return m_duration;

119

120

100

void

121

void

101

AmpduTag::Print (std::ostream &os) const

122

AmpduTag::Print (std::ostream &os) const

102

123

103

  os << "A-MPDU exists=" << m_ampdu;

124

  os << "A-MPDU exists=" << m_ampdu

125

     << " Remaining number of MPDUs=" << m_nbOfMpdus

126

     << " Remaining A-MPDU duration=" << m_duration;

104

127

105

128

106

} //namespace ns3

129

} //namespace ns3




 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Authors: Ghada Badawy <gbadawy@gmail.com>
 *          Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#ifndef AMPDU_TAG_H
#define AMPDU_TAG_H

#include "ns3/packet.h"
#include "ns3/nstime.h"

namespace ns3 {


   */
  void SetAmpdu (bool supported);
  /**
   * \param nbofmpdus the remaining number of MPDUs
   *
   * Set the remaining number of MPDUs in the A-MPDU.
   */
  void SetRemainingNbOfMpdus (uint8_t nbofmpdus);
  /**
   * \param duration the remaining duration of the A-MPDU
   *
   * Set the remaining duration of the A-MPDU.
   */
  void SetRemainingAmpduDuration (Time duration);

  virtual void Serialize (TagBuffer i) const;
  virtual void Deserialize (TagBuffer i);

   */
  bool GetAmpdu (void) const;
  /**
   * \return the remaining number of MPDUs in an A-MPDU
   *
   * Returns the remaining number of MPDUs in an A-MPDU
   */
  uint8_t GetRemainingNbOfMpdus (void) const;
  /**
   * \return the remaining duration of an A-MPDU
   *
   * Returns the remaining duration of an A-MPDU
   */
  Time GetRemainingAmpduDuration (void) const;

private:
  uint8_t m_ampdu;     //!< Flag whether it is an A-MPDU
  uint8_t m_nbOfMpdus; //!< Remaining number of MPDUs in the A-MPDU
  Time m_duration;     //!< Remaining duration of the A-MPDU in nanoseconds
};

} //namespace ns3




    m_listener (0),
    m_phyMacLowListener (0),
    m_ctsToSelfSupported (false),
    m_receivedAtLeastOneMpdu (false),
    m_nTxMpdus (0)
{
  NS_LOG_FUNCTION (this);

MacLow::ResetPhy (void)
{
  m_phy->SetReceiveOkCallback (MakeNullCallback<void, Ptr<Packet>, double, WifiTxVector, enum WifiPreamble> ());
  m_phy->SetReceiveErrorCallback (MakeNullCallback<void, Ptr<Packet>, double> ());
  RemovePhyMacLowListener (m_phy);
  m_phy = 0;
}

        {
          AmpduTag ampdu;
          m_currentPacket->PeekPacketTag (ampdu);
          if (ampdu.GetRemainingNbOfMpdus () > 0)
            {
              m_txParams.EnableCompressedBlockAck ();
            }

}

void
MacLow::ReceiveError (Ptr<Packet> packet, double rxSnr)
{
  NS_LOG_FUNCTION (this << packet << rxSnr);
  NS_LOG_DEBUG ("rx failed ");
  if (isEndOfFrame == true && m_receivedAtLeastOneMpdu == true)
    {
      WifiMacHeader hdr;
      AmpduTag ampdu;
      if (packet->RemovePacketTag (ampdu))
        {
          MpduAggregator::DeaggregatedMpdus mpdu = MpduAggregator::Deaggregate (packet);
          mpdu.begin ()->first->PeekHeader (hdr);
        }
      else
        {
          packet->PeekHeader (hdr);
        }
      if (hdr.GetAddr1 () != m_self)
        {
          NS_LOG_DEBUG ("hdr addr1 " << hdr.GetAddr1 () << "not for me (" << m_self << "); returning");
          return;
        }
      NS_ASSERT (m_lastReceivedHdr.IsQosData ());
      NS_LOG_DEBUG ("last a-mpdu subframe detected/sendImmediateBlockAck from=" << m_lastReceivedHdr.GetAddr2 ());
      m_sendAckEvent = Simulator::Schedule (GetSifs (),
                                            &MacLow::SendBlockAckAfterAmpdu, this,
                                            m_lastReceivedHdr.GetQosTid (),
                                            m_lastReceivedHdr.GetAddr2 (),
                                            m_lastReceivedHdr.GetDuration (),
                                            m_currentTxVector,
                                            rxSnr);
      m_receivedAtLeastOneMpdu = false;
    }
  if (m_txParams.MustWaitFastAck ())
    {
      NS_ASSERT (m_fastAckFailedTimeoutEvent.IsExpired ());

              NS_ASSERT (i != m_bAckCaches.end ());
              (*i).second.UpdateWithBlockAckReq (blockAckReq.GetStartingSequence ());

              //NS_ASSERT (m_sendAckEvent.IsExpired ());
              m_sendAckEvent.Cancel ();
              /* See section 11.5.3 in IEEE 802.11 for mean of this timer */
              ResetBlockAckInactivityTimerIfNeeded (it->second.first);
              if ((*it).second.first.IsImmediateBlockAck ())

                {
                  NS_FATAL_ERROR ("Delayed block ack not supported.");
                }
              m_receivedAtLeastOneMpdu = false;
            }
          else
            {

  else if (hdr.IsCtl ())
    {
      NS_LOG_DEBUG ("rx drop " << hdr.GetTypeString ());
      m_receivedAtLeastOneMpdu = false;
    }
  else if (hdr.GetAddr1 () == m_self)
    {

                                                    hdr.GetDuration (),
                                                    txVector.GetMode (),
                                                    rxSnr);
              m_receivedAtLeastOneMpdu = false;
            }
          else if (hdr.IsQosBlockAck ())
            {

                                                    hdr.GetDuration (),
                                                    txVector.GetMode (),
                                                    rxSnr);
              m_receivedAtLeastOneMpdu = false;
            }
        }
      goto rxPacket;

          if (hdr.IsData () || hdr.IsMgt ())
            {
              NS_LOG_DEBUG ("rx group from=" << hdr.GetAddr2 ());
              m_receivedAtLeastOneMpdu = false;
              goto rxPacket;
            }
          else

      AmpduTag ampdutag;
      ampdutag.SetAmpdu (true);
      Time delay = Seconds (0);
      Time remainingAmpduDuration = m_phy->CalculateTxDuration (packet->GetSize (), txVector, preamble, m_phy->GetFrequency ());
      if (queueSize > 1 || vhtSingleMpdu)
        {
          txVector.SetAggregation (true);

            }

          listenerIt->second->GetMpduAggregator ()->AddHeaderAndPad (newPacket, last, vhtSingleMpdu);
          
          ampdutag.SetNoOfMpdus (queueSize);
          newPacket->AddPacketTag (ampdutag);

          if (delay == Seconds (0))
            {
              if (!vhtSingleMpdu)

                {
                  mpdutype = NORMAL_MPDU;
                }
            }
          
          Time mpduDuration = m_phy->CalculateTxDuration (newPacket->GetSize (), txVector, preamble, m_phy->GetFrequency (), mpdutype, 0);
          remainingAmpduDuration -= mpduDuration;

          ampdutag.SetRemainingNbOfMpdus (queueSize - 1);
          ampdutag.SetRemainingAmpduDuration (remainingAmpduDuration);
          newPacket->AddPacketTag (ampdutag);

          if (delay == Seconds (0))
            {
              m_phy->SendPacket (newPacket, txVector, preamble, mpdutype);
            }
          else

            }
          if (queueSize > 1)
            {
              delay = delay + mpduDuration;
            }

          preamble = WIFI_PREAMBLE_NONE;
        }
    }

      StartDataTxTimers (blockAckReqTxVector);
    }

  NS_ASSERT (duration >= NanoSeconds (0));
  hdr.SetDuration (duration);
  //here should be present a control about immediate or delayed block ack
  //for now we assume immediate

  if (aggregatedPacket->RemovePacketTag (ampdu))
    {
      ampduSubframe = true;
      m_currentTxVector = txVector;
      MpduAggregator::DeaggregatedMpdus packets = MpduAggregator::Deaggregate (aggregatedPacket);
      MpduAggregator::DeaggregatedMpdusCI n = packets.begin ();


          NS_LOG_DEBUG ("Receive VHT single MPDU");
          ampduSubframe = false;
        }
      else if (preamble != WIFI_PREAMBLE_NONE || !m_sendAckEvent.IsRunning ())
        {
          m_sendAckEvent = Simulator::Schedule (ampdu.GetRemainingAmpduDuration () + GetSifs (),
                                                &MacLow::SendBlockAckAfterAmpdu, this,
                                                firsthdr.GetQosTid (),
                                                firsthdr.GetAddr2 (),
                                                firsthdr.GetDuration (),
                                                txVector,
                                                rxSnr);
        }

      if (firsthdr.GetAddr1 () == m_self)
        {
          if (!vhtSingleMpdu)
            {
              m_receivedAtLeastOneMpdu = true;
            }
          if (firsthdr.IsAck () || firsthdr.IsBlockAck () || firsthdr.IsBlockAckReq ())
            {
              ReceiveOk ((*n).first, rxSnr, txVector, preamble, ampduSubframe);

            }
        }

      if (ampdu.GetRemainingNbOfMpdus () == 0 && !vhtSingleMpdu)
        {
          if (normalAck)
            {

              AgreementsI it = m_bAckAgreements.find (std::make_pair (firsthdr.GetAddr2 (), tid));
              if (it != m_bAckAgreements.end ())
                {
                  NS_ASSERT (m_sendAckEvent.IsExpired ());
                  /* See section 11.5.3 in IEEE 802.11 for mean of this timer */
                  ResetBlockAckInactivityTimerIfNeeded (it->second.first);
                  NS_LOG_DEBUG ("rx A-MPDU/sendImmediateBlockAck from=" << firsthdr.GetAddr2 ());
                  NS_ASSERT (m_sendAckEvent.IsRunning ());
                                                        &MacLow::SendBlockAckAfterAmpdu, this,
                                                        firsthdr.GetQosTid (),
                                                        firsthdr.GetAddr2 (),
                                                        firsthdr.GetDuration (),
                                                        txVector,
                                                        rxSnr);
                }
              else
                {
                  NS_LOG_DEBUG ("There's not a valid agreement for this block ack request.");
                }
            }
          m_receivedAtLeastOneMpdu = false;
        }
    }
  else

                      listenerIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket);
                      currentAggregatedPacket->AddHeader (blockAckReq);
                    }

                  if (qosPolicy == 0)
                    {
                      listenerIt->second->CompleteTransfer (hdr.GetAddr1 (), tid);
                    }

                  //Add packet tag
                  AmpduTag ampdutag;
                  ampdutag.SetAmpdu (true);
                  ampdutag.SetRemainingNbOfMpdus (i - 1);
                  newPacket = currentAggregatedPacket;
                  newPacket->AddPacketTag (ampdutag);

                  NS_LOG_DEBUG ("tx unicast A-MPDU");
                  listenerIt->second->SetAmpdu (hdr.GetAddr1 (), true);
                }

              //Add packet tag
              AmpduTag ampdutag;
              ampdutag.SetAmpdu (true);
              ampdutag.SetNoOfMpdus (1);

              newPacket = currentAggregatedPacket;
              newPacket->AddHeader (peekedHdr);
              WifiMacTrailer fcs;

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

Lines 736-742	Link Here

736

   * This method is typically invoked by the lower PHY layer to notify

736

   * This method is typically invoked by the lower PHY layer to notify

737

   * the MAC layer that a packet was unsuccessfully received.

737

   * the MAC layer that a packet was unsuccessfully received.

738

*/

738

*/

739

  void ReceiveError (Ptr<Packet> packet, double rxSnr, bool isEndOfFrame);

739

  void ReceiveError (Ptr<Packet> packet, double rxSnr);

740

/**

740

/**

741

   * \param duration switching delay duration.

741

   * \param duration switching delay duration.

742

Lines 1378-1384	Link Here

1378

  uint8_t m_sentMpdus;                //!< Number of transmitted MPDUs in an A-MPDU that have not been acknowledged yet

1378

  uint8_t m_sentMpdus;                //!< Number of transmitted MPDUs in an A-MPDU that have not been acknowledged yet

1379

  Ptr<WifiMacQueue> m_aggregateQueue; //!< Queue used for MPDU aggregation

1379

  Ptr<WifiMacQueue> m_aggregateQueue; //!< Queue used for MPDU aggregation

1380

  WifiTxVector m_currentTxVector;     //!< TXVECTOR used for the current packet transmission

1380

  WifiTxVector m_currentTxVector;     //!< TXVECTOR used for the current packet transmission

1381

  bool m_receivedAtLeastOneMpdu;      //!< Flag whether an MPDU has already been successfully received while receiving an A-MPDU

1382

  std::vector<Item> m_txPackets;      //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases.

1381

  std::vector<Item> m_txPackets;      //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases.

1383

  uint32_t m_nTxMpdus;                //!<Holds the number of transmitted MPDUs in the last A-MPDU transmission

1382

  uint32_t m_nTxMpdus;                //!<Holds the number of transmitted MPDUs in the last A-MPDU transmission

1384

};

1383

};




}

void
WifiPhyStateHelper::SwitchFromRxEndError (Ptr<Packet> packet, double snr)
{
  m_rxErrorTrace (packet, snr);
  NotifyRxEndError ();
  DoSwitchFromRx ();
  if (!m_rxErrorCallback.IsNull ())
    {
      m_rxErrorCallback (packet, snr);
    }
}





   *
   * \param packet the packet that we failed to received
   * \param snr the SNR of the received packet
   * \param isEndOfFrame PHY-RXEND indication.
   */
  void SwitchFromRxEndError (Ptr<Packet> packet, double snr);
  /**
   * Switch to CCA busy.
   *

   *
   * \param [in] packet       The received packet.
   * \param [in] snr          The SNR of the received packet.
   * \param [in] isEndOfFrame PHY-RXEND indication..
   */
  typedef void (* RxEndErrorTracedCallback)
    (Ptr<const Packet> packet, double snr);

  /**
   * TracedCallback signature for transmit event.

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

Lines 192-200	Link Here

192

/**

192

/**

193

   * arg1: packet received unsuccessfully

193

   * arg1: packet received unsuccessfully

194

   * arg2: snr of packet

194

   * arg2: snr of packet

195

   * arg3: PHY-RXEND flag

196

*/

195

*/

197

  typedef Callback<void, Ptr<Packet>, double, bool> RxErrorCallback;

196

  typedef Callback<void, Ptr<Packet>, double> RxErrorCallback;

198

197

199

  static TypeId GetTypeId (void);

198

  static TypeId GetTypeId (void);

200

199




          else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum == 0)
            {
              //received the first MPDU in an MPDU
              m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
              m_rxMpduReferenceNumber++;
            }
          else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
            {
              //received the other MPDUs that are part of the A-MPDU
              if (ampduTag.GetRemainingNbOfMpdus () < (m_mpdusNum - 1))
                {
                  NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetRemainingNbOfMpdus ());
                  m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
                }
              else
                {

        {
          /* failure. */
          NotifyRxDrop (packet);
          m_state->SwitchFromRxEndError (packet, snrPer.snr);
          m_state->SwitchFromRxEndError (packet, snrPer.snr, isEndOfFrame);
        }
    }
  else
    {
      m_state->SwitchFromRxEndError (packet, snrPer.snr);
      m_state->SwitchFromRxEndError (packet, snrPer.snr, isEndOfFrame);
    }

  if (preamble == WIFI_PREAMBLE_NONE && mpdutype == LAST_MPDU_IN_AGGREGATE)

Return to bug 2307