Attachment #639 for bug #602

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




DcaTxop::NeedRtsRetransmission (void)
{
  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
  return station->NeedRtsRetransmission (&m_currentHdr);
}

bool
DcaTxop::NeedDataRetransmission (void)
{
  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
  return station->NeedDataRetransmission (&m_currentHdr);
}
bool
DcaTxop::NeedFragmentation (void)

(-)a/src/devices/wifi/edca-txop-n.cc (-4 / +20 lines)

Lines 413-419	Link Here

413

414

      MY_DEBUG ("Cts Fail");

414

      MY_DEBUG ("Cts Fail");

415

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

415

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

416

      station->ReportFinalRtsFailed ();

416

      if (m_currentHdr.IsQosData ())

417

418

          uint8_t tid = m_currentHdr.GetQosTid ();

419

          station->ReportFinalRtsFailed (QosUtilsMapTidToAc (tid));

420

421

      else

422

423

          station->ReportFinalRtsFailed ();

424

417

      if (!m_txFailedCallback.IsNull ())

425

      if (!m_txFailedCallback.IsNull ())

418

426

419

          m_txFailedCallback (m_currentHdr);

427

          m_txFailedCallback (m_currentHdr);

Lines 483-489	Link Here

483

491

484

      MY_DEBUG ("Ack Fail");

492

      MY_DEBUG ("Ack Fail");

485

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

493

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

486

      station->ReportFinalDataFailed ();

494

      if (m_currentHdr.IsQosData ())

495

496

         uint8_t tid = m_currentHdr.GetQosTid ();

497

         station->ReportFinalDataFailed (QosUtilsMapTidToAc (tid));

498

499

      else

500

501

         station->ReportFinalDataFailed ();

502

487

      if (!m_txFailedCallback.IsNull ())

503

      if (!m_txFailedCallback.IsNull ())

488

504

489

          m_txFailedCallback (m_currentHdr);

505

          m_txFailedCallback (m_currentHdr);

Lines 543-556	Link Here

543

EdcaTxopN::NeedRtsRetransmission (void)

559

EdcaTxopN::NeedRtsRetransmission (void)

544

560

545

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

561

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

546

  return station->NeedRtsRetransmission (m_currentPacket);

562

  return station->NeedRtsRetransmission (&m_currentHdr);

547

563

548

564

549

bool

565

bool

550

EdcaTxopN::NeedDataRetransmission (void)

566

EdcaTxopN::NeedDataRetransmission (void)

551

567

552

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

568

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

553

  return station->NeedDataRetransmission (m_currentPacket);

569

  return station->NeedDataRetransmission (&m_currentHdr);

554

570

555

571

556

void

572

void

(-)a/src/devices/wifi/mac-low.cc (-7 / +54 lines)

Lines 591-598	Link Here

591

      packet->RemovePacketTag (tag);

591

      packet->RemovePacketTag (tag);

592

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

592

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

593

      station->ReportRxOk (rxSnr, txMode);

593

      station->ReportRxOk (rxSnr, txMode);

594

      station->ReportRtsOk (rxSnr, txMode, tag.Get ());

594

      if (m_currentHdr.IsQosData ())

595

596

          uint8_t tid = m_currentHdr.GetQosTid ();

597

          station->ReportRtsOk (rxSnr, txMode, tag.Get (), QosUtilsMapTidToAc (tid));

598

599

      else

600

601

          station->ReportRtsOk (rxSnr, txMode, tag.Get ());

602

596

      m_ctsTimeoutEvent.Cancel ();

603

      m_ctsTimeoutEvent.Cancel ();

597

      NotifyCtsTimeoutResetNow ();

604

      NotifyCtsTimeoutResetNow ();

598

      m_listener->GotCts (rxSnr, txMode);

605

      m_listener->GotCts (rxSnr, txMode);

Lines 615-621	Link Here

615

      packet->RemovePacketTag (tag);

622

      packet->RemovePacketTag (tag);

616

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

623

      WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

617

      station->ReportRxOk (rxSnr, txMode);

624

      station->ReportRxOk (rxSnr, txMode);

618

      station->ReportDataOk (rxSnr, txMode, tag.Get ());

625

      if (m_currentHdr.IsQosData ())

626

627

          uint8_t tid = m_currentHdr.GetQosTid ();

628

          station->ReportDataOk (rxSnr, txMode, tag.Get (), QosUtilsMapTidToAc (tid));

629

630

      else

631

632

          station->ReportDataOk (rxSnr, txMode, tag.Get ());

633

619

      bool gotAck = false;

634

      bool gotAck = false;

620

      if (m_txParams.MustWaitNormalAck () &&

635

      if (m_txParams.MustWaitNormalAck () &&

621

          m_normalAckTimeoutEvent.IsRunning ())

636

          m_normalAckTimeoutEvent.IsRunning ())

Lines 930-936	Link Here

930

  // we should restart a new cts timeout now until the expected

945

  // we should restart a new cts timeout now until the expected

931

  // end of rx if there was a rx start before now.

946

  // end of rx if there was a rx start before now.

932

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

947

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

933

  station->ReportRtsFailed ();

948

  if (m_currentHdr.IsQosData ())

949

950

      uint8_t tid = m_currentHdr.GetQosTid ();

951

      station->ReportRtsFailed (QosUtilsMapTidToAc (tid));

952

953

  else

954

955

      station->ReportRtsFailed ();

956

934

  m_currentPacket = 0;

957

  m_currentPacket = 0;

935

  MacLowTransmissionListener *listener = m_listener;

958

  MacLowTransmissionListener *listener = m_listener;

936

  m_listener = 0;

959

  m_listener = 0;

Lines 945-951	Link Here

945

  // we should restart a new ack timeout now until the expected

968

  // we should restart a new ack timeout now until the expected

946

  // end of rx if there was a rx start before now.

969

  // end of rx if there was a rx start before now.

947

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

970

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

948

  station->ReportDataFailed ();

971

  if (m_currentHdr.IsQosData ())

972

973

      uint8_t tid = m_currentHdr.GetQosTid ();

974

      station->ReportDataFailed (QosUtilsMapTidToAc (tid));

975

976

  else

977

978

      station->ReportDataFailed ();

979

949

  MacLowTransmissionListener *listener = m_listener;

980

  MacLowTransmissionListener *listener = m_listener;

950

  m_listener = 0;

981

  m_listener = 0;

951

  listener->MissedAck ();

982

  listener->MissedAck ();

Lines 955-961	Link Here

955

986

956

  NS_LOG_FUNCTION (this);

987

  NS_LOG_FUNCTION (this);

957

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

988

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

958

  station->ReportDataFailed ();

989

  if (m_currentHdr.IsQosData ())

990

991

      uint8_t tid = m_currentHdr.GetQosTid ();

992

      station->ReportDataFailed (QosUtilsMapTidToAc (tid));

993

994

  else

995

996

      station->ReportDataFailed ();

997

959

  MacLowTransmissionListener *listener = m_listener;

998

  MacLowTransmissionListener *listener = m_listener;

960

  m_listener = 0;

999

  m_listener = 0;

961

  if (m_phy->IsStateIdle ())

1000

  if (m_phy->IsStateIdle ())

Lines 973-979	Link Here

973

1012

974

  NS_LOG_FUNCTION (this);

1013

  NS_LOG_FUNCTION (this);

975

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

1014

  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());

976

  station->ReportDataFailed ();

1015

  if (m_currentHdr.IsQosData ())

1016

1017

      uint8_t tid = m_currentHdr.GetQosTid ();

1018

      station->ReportDataFailed (QosUtilsMapTidToAc (tid));

1019

1020

  else

1021

1022

      station->ReportDataFailed ();

1023

977

  MacLowTransmissionListener *listener = m_listener;

1024

  MacLowTransmissionListener *listener = m_listener;

978

  m_listener = 0;

1025

  m_listener = 0;

979

  if (m_phy->IsStateIdle ())

1026

  if (m_phy->IsStateIdle ())




{
  static TypeId tid = TypeId ("ns3::WifiRemoteStation")
    .SetParent<Object> ()
    .AddTraceSource ("Ssrc", "The value of the ssrc counter: indicates the number of retransmissions of RTS for non-QoS packets.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_ssrc))
    .AddTraceSource ("Slrc", "The value of the slrc counter: indicates the number of retransmissions of DATA for non-QoS packets.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_slrc))
    .AddTraceSource ("voSsrc", "The value of the ssrc counter for AC_VO access class: indicates the number of retransmissions of RTS for\
                     packets belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_voSsrc))
    .AddTraceSource ("voSlrc", "The value of the slrc counter AC_VO access class: indicates the number of retransmissions of DATA packets\
                     belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_voSlrc))
    .AddTraceSource ("viSsrc", "The value of the ssrc counter for AC_VI access class: indicates the number of retransmissions of RTS for\
                     packets belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_viSsrc))
    .AddTraceSource ("viSlrc", "The value of the slrc counter AC_VI access class: indicates the number of retransmissions of DATA packets\
                     belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_viSlrc))
    .AddTraceSource ("beSsrc", "The value of the ssrc counter for AC_BE access class: indicates the number of retransmissions of RTS for\
                     packets belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_beSsrc))
    .AddTraceSource ("beSlrc", "The value of the slrc counter AC_BE access class: indicates the number of retransmissions of DATA packets\
                     belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_beSlrc))
    .AddTraceSource ("bkSsrc", "The value of the ssrc counter for AC_BK access class: indicates the number of retransmissions of RTS for\
                     packets belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_bkSsrc))
    .AddTraceSource ("bkSlrc", "The value of the slrc counter AC_BK access class: indicates the number of retransmissions of DATA packets\
                     belonging to voice access class.",
                     MakeTraceSourceAccessor (&WifiRemoteStation::m_bkSlrc))
    ;
  return tid;
}

  : m_state (BRAND_NEW),
    m_ssrc (0),
    m_slrc (0),
    m_voSsrc (0),
    m_voSlrc (0),
    m_viSsrc (0),
    m_viSlrc (0),
    m_beSsrc (0),
    m_beSlrc (0),
    m_bkSsrc (0),
    m_bkSlrc (0),
    m_avgSlrcCoefficient(0.9),
    m_avgSlrc (0)
{
  m_qosSsrc.insert (std::make_pair (AC_VO, &m_voSsrc));
  m_qosSsrc.insert (std::make_pair (AC_VI, &m_viSsrc));
  m_qosSsrc.insert (std::make_pair (AC_BE, &m_beSsrc));
  m_qosSsrc.insert (std::make_pair (AC_BK, &m_bkSsrc));

  m_qosSlrc.insert (std::make_pair (AC_VO, &m_voSlrc));
  m_qosSlrc.insert (std::make_pair (AC_VI, &m_viSlrc));
  m_qosSlrc.insert (std::make_pair (AC_BE, &m_beSlrc));
  m_qosSlrc.insert (std::make_pair (AC_BK, &m_bkSlrc));
}
WifiRemoteStation::~WifiRemoteStation ()
{}


    }
}
bool
WifiRemoteStation::NeedRtsRetransmission (const WifiMacHeader *hdr)
{
  if (hdr->IsQosData ())
    {
      AccessClass ac = QosUtilsMapTidToAc (hdr->GetQosTid ());
      return ((*m_qosSsrc.find (ac)->second) < GetManager ()->GetMaxSsrc ());
    }
  else
   {
      return (m_ssrc < GetManager ()->GetMaxSsrc ());
   }
}

bool
WifiRemoteStation::NeedDataRetransmission (const WifiMacHeader *hdr)
{
  if (hdr->IsQosData ())
    {
      AccessClass ac = QosUtilsMapTidToAc (hdr->GetQosTid ());
      return ((*m_qosSlrc.find (ac)->second) < GetManager ()->GetMaxSlrc ());
    }
  else
    {
      return (m_slrc < GetManager ()->GetMaxSlrc ());
    }
}

bool

}

void 
WifiRemoteStation::ReportRtsFailed (enum AccessClass ac)
{
  if (ac == AC_UNDEF)
    {
      NS_LOG_INFO ("Access class not supported");
      NS_ASSERT (false);
    }
  else if (ac == AC_BE_NQOS)
    {
      m_ssrc++;
    }
  else
    {
      (*m_qosSsrc.find (ac)->second)++;
    }
  GetManager ()->NotifyTxRtsFailed (m_address);
  DoReportRtsFailed ();
}

void 
WifiRemoteStation::ReportDataFailed (enum AccessClass ac)
{
  if (ac == AC_UNDEF)
    {
      NS_LOG_INFO ("Access class not supported");
      NS_ASSERT (false);
    }
  else if (ac == AC_BE_NQOS)
    {
      m_slrc++;
    }
  else
    {
      (*m_qosSlrc.find (ac)->second)++;
    }
  GetManager ()->NotifyTxDataFailed (m_address);
  DoReportDataFailed ();
}

void 
WifiRemoteStation::ReportRtsOk (double ctsSnr, WifiMode ctsMode, double rtsSnr, enum AccessClass ac)
{
  if (ac == AC_UNDEF)
    {
      NS_LOG_INFO ("Access class not supported");
      NS_ASSERT (false);
    }
  else if (ac == AC_BE_NQOS)
    {
      m_ssrc = 0;
    }
  else
    {
      *m_qosSsrc.find (ac)->second = 0;
    }
  DoReportRtsOk (ctsSnr, ctsMode, rtsSnr);
}

void 
WifiRemoteStation::ReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr, enum AccessClass ac)
{
  m_avgSlrc = m_avgSlrc * m_avgSlrcCoefficient + (double) m_slrc * (1 - m_avgSlrcCoefficient);
  if (ac == AC_UNDEF)
    {
      NS_LOG_INFO ("Access class not supported");
      NS_ASSERT (false);
    }
  else if (ac == AC_BE_NQOS)
    {
      m_slrc = 0;
    }
  else
    {
      *m_qosSlrc.find (ac)->second = 0;
    }
  DoReportDataOk (ackSnr, ackMode, dataSnr);
}

void 
WifiRemoteStation::ReportFinalRtsFailed (enum AccessClass ac)
{
  if (ac == AC_UNDEF)
    {
      NS_LOG_INFO ("Access class not supported");
      NS_ASSERT (false);
    }
  else if (ac == AC_BE_NQOS)
    {
      m_ssrc = 0;
    }
  else
    {
      *m_qosSsrc.find (ac)->second = 0;
    }
  GetManager ()->NotifyTxFinalRtsFailed (m_address);
  DoReportFinalRtsFailed ();
}

void 
WifiRemoteStation::ReportFinalDataFailed (enum AccessClass ac)
{
  if (ac == AC_UNDEF)
    {
      NS_LOG_INFO ("Access class not supported");
      NS_ASSERT (false);
    }
  else if (ac == AC_BE_NQOS)
    {
      m_slrc = 0;
    }
  else
    {
      *m_qosSlrc.find (ac)->second = 0;
    }
  GetManager ()->NotifyTxFinalDataFailed (m_address);
  DoReportFinalDataFailed ();
}

void 
WifiRemoteStation::ReportRxOk (double rxSnr, WifiMode txMode, enum AccessClass ac)
{
  //How should we use 'ac' parameter here?
  DoReportRxOk (rxSnr, txMode);
}
} // namespace ns3




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2005,2006,2007 INRIA
 * Copyright (c) 2009 MIRKO BANCHI
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as 

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
 * Author: Mirko Banchi <mk.banchi@gmail.com>
 */
#ifndef WIFI_REMOTE_STATION_MANAGER_H
#define WIFI_REMOTE_STATION_MANAGER_H

#include <vector>
#include <utility>
#include <map>
#include "ns3/mac48-address.h"
#include "ns3/packet.h"
#include "ns3/object.h"
#include "ns3/traced-value.h"
#include "ns3/wifi-mac-header.h"
#include "wifi-mode.h"
#include "qos-utils.h"

namespace ns3 {


   */
  WifiMode GetRtsMode (Ptr<const Packet> packet);
  /**
   * \param ac Represents access class of the packet for which a rts was transmitted.
   *
   * Should be invoked whenever the RtsTimeout associated to a transmission
   * attempt expires.
   */
  void ReportRtsFailed (enum AccessClass ac = AC_BE_NQOS);
  /**
   * \param ac Access class which failed data belongs.
   *
   * Should be invoked whenever the AckTimeout associated to a transmission
   * attempt expires.
   */
  void ReportDataFailed (enum AccessClass ac = AC_BE_NQOS);
  /**
   * \param ac Represents access class of the packet for which the rts was transmitted.
   *
   * Should be invoked whenever we receive the Cts associated to an RTS 
   * we just sent.
   */
  void ReportRtsOk (double ctsSnr, WifiMode ctsMode, double rtsSnr, enum AccessClass ac = AC_BE_NQOS);
  /**
   * \param ac Access class which correct received data belongs.
   *
   * Should be invoked whenever we receive the Ack associated to a data packet
   * we just sent.
   */
  void ReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr, enum AccessClass ac = AC_BE_NQOS);
  /**
   * \param ac Represents access class of the packet for which a rts was transmitted.
   *
   * Should be invoked after calling ReportRtsFailed if 
   * NeedRtsRetransmission returns false
   */
  void ReportFinalRtsFailed (enum AccessClass ac = AC_BE_NQOS);
  /**
   * \param ac Access class which failed data belongs.
   *
   * Should be invoked after calling ReportDataFailed if 
   * NeedDataRetransmission returns false
   */
  void ReportFinalDataFailed (enum AccessClass ac = AC_BE_NQOS);

  /**
   * \param rxSnr the snr of the packet received

   *
   * Should be invoked whenever a packet is successfully received.
   */
  void ReportRxOk (double rxSnr, WifiMode txMode, enum AccessClass ac = AC_BE_NQOS);

  /**
   * \param packet the packet to send

   */
  virtual bool NeedRts (Ptr<const Packet> packet);
  /**
   * \param hdr the header of the packet to send
   * \returns true if we want to restart a failed RTS/CTS 
   *          handshake, false otherwise.
   */
  virtual bool NeedRtsRetransmission (const WifiMacHeader *hdr);
  /**
   * \param hdr the header of the packet to send
   * \returns true if we want to resend a packet 
   *          after a failed transmission attempt, false otherwise.
   */
  virtual bool NeedDataRetransmission (const WifiMacHeader *hdr);

  /**
   * \param packet the packet to send

  SupportedModes m_modes;
  TracedValue<uint32_t> m_ssrc;
  TracedValue<uint32_t> m_slrc;
  /* voice access class retry counters */
  TracedValue<uint32_t> m_voSsrc;
  TracedValue<uint32_t> m_voSlrc;
  /* video access class retry counters */
  TracedValue<uint32_t> m_viSsrc;
  TracedValue<uint32_t> m_viSlrc;
  /* best-effort access class retry counters */
  TracedValue<uint32_t> m_beSsrc;
  TracedValue<uint32_t> m_beSlrc;
  /* background access class retry counters */
  TracedValue<uint32_t> m_bkSsrc;
  TracedValue<uint32_t> m_bkSlrc;
  /* next two maps are defined for an easy access to qos retry counters */
  std::map<AccessClass, TracedValue<uint32_t>* > m_qosSsrc;
  std::map<AccessClass, TracedValue<uint32_t>* > m_qosSlrc;
  double m_avgSlrcCoefficient;
  double m_avgSlrc;
  Mac48Address m_address;

Return to bug 602