Attachment #1909 for bug #1971

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

(-)a/src/mesh/model/dot11s/airtime-metric.cc (-1 / +1 lines)

Lines 95-101	Link Here

  //calculate metric

  //calculate metric

  uint32_t metric = (uint32_t)((double)( /*Overhead + payload*/

  uint32_t metric = (uint32_t)((double)( /*Overhead + payload*/

                                 mac->GetPifs () + mac->GetSlot () + mac->GetEifsNoDifs () + //DIFS + SIFS + AckTxTime = PIFS + SLOT + EifsNoDifs

                                 mac->GetPifs () + mac->GetSlot () + mac->GetEifsNoDifs () + //DIFS + SIFS + AckTxTime = PIFS + SLOT + EifsNoDifs

                                 mac->GetWifiPhy ()->CalculateTxDuration (m_testFrame->GetSize (), txVector, WIFI_PREAMBLE_LONG)

                                 mac->GetWifiPhy ()->CalculateTxDuration (m_testFrame->GetSize (), txVector, WIFI_PREAMBLE_LONG, mac->GetWifiPhy ()->GetFrequency())

                                 ).GetMicroSeconds () / (10.24 * (1.0 - failAvg)));

                                 ).GetMicroSeconds () / (10.24 * (1.0 - failAvg)));

100

  return metric;

100

  return metric;

101




    preamble= WIFI_PREAMBLE_HT_MF;
  else
    preamble=WIFI_PREAMBLE_LONG;
  return m_phy->CalculateTxDuration (GetAckSize (), ackTxVector, preamble, m_phy->GetFrequency());
}
Time
MacLow::GetBlockAckDuration (Mac48Address to, WifiTxVector blockAckReqTxVector, enum BlockAckType type) const

    preamble= WIFI_PREAMBLE_HT_MF;
  else
    preamble=WIFI_PREAMBLE_LONG;
  return m_phy->CalculateTxDuration (GetBlockAckSize (type), blockAckReqTxVector, preamble, m_phy->GetFrequency());
}
Time
MacLow::GetCtsDuration (Mac48Address to, WifiTxVector rtsTxVector) const

    preamble= WIFI_PREAMBLE_HT_MF;
  else
    preamble=WIFI_PREAMBLE_LONG;
  return m_phy->CalculateTxDuration (GetCtsSize (), ctsTxVector, preamble, m_phy->GetFrequency());
}
uint32_t
MacLow::GetCtsSize (void) const

        {
          preamble = WIFI_PREAMBLE_LONG;
        }
      txTime += m_phy->CalculateTxDuration (GetRtsSize (), rtsTxVector, preamble, m_phy->GetFrequency());
      txTime += GetCtsDuration (hdr->GetAddr1 (), rtsTxVector);
      txTime += Time (GetSifs () * 2);
    }

  else
    preamble=WIFI_PREAMBLE_LONG;
  uint32_t dataSize = GetSize (packet, hdr);
  txTime += m_phy->CalculateTxDuration (dataSize, dataTxVector, preamble, m_phy->GetFrequency());
  if (params.MustWaitAck ())
    {
      txTime += GetSifs ();

      else
        preamble=WIFI_PREAMBLE_LONG;
      txTime += GetSifs ();
      txTime += m_phy->CalculateTxDuration (params.GetNextPacketSize (), dataTxVector, preamble, m_phy->GetFrequency());
    }
  return txTime;
}

          cts.SetType (WIFI_MAC_CTL_CTS);
          WifiTxVector txVector=GetRtsTxVector (packet, &hdr);
          Time navCounterResetCtsMissedDelay =
            m_phy->CalculateTxDuration (cts.GetSerializedSize (), txVector, preamble, m_phy->GetFrequency()) +
            Time (2 * GetSifs ()) + Time (2 * GetSlotTime ());
          m_navCounterResetCtsMissed = Simulator::Schedule (navCounterResetCtsMissedDelay,
                                                            &MacLow::NavCounterResetCtsMissed, this,

      duration += GetCtsDuration (m_currentHdr.GetAddr1 (), rtsTxVector);
      duration += GetSifs ();
      duration += m_phy->CalculateTxDuration (GetSize (m_currentPacket, &m_currentHdr),
                                              dataTxVector, preamble, m_phy->GetFrequency());
      duration += GetSifs ();
      duration += GetAckDuration (m_currentHdr.GetAddr1 (), dataTxVector);
    }
  rts.SetDuration (duration);

  Time txDuration = m_phy->CalculateTxDuration (GetRtsSize (), rtsTxVector, preamble, m_phy->GetFrequency());
  Time timerDelay = txDuration + GetCtsTimeout ();

  NS_ASSERT (m_ctsTimeoutEvent.IsExpired ());

  else
    preamble=WIFI_PREAMBLE_LONG;
 
  Time txDuration = m_phy->CalculateTxDuration (GetSize (m_currentPacket, &m_currentHdr), dataTxVector, preamble, m_phy->GetFrequency());
  if (m_txParams.MustWaitNormalAck ())
    {
      Time timerDelay = txDuration + GetAckTimeout ();

        {
          duration += GetSifs ();
          duration += m_phy->CalculateTxDuration (m_txParams.GetNextPacketSize (),
                                                  dataTxVector, preamble, m_phy->GetFrequency());
          if (m_txParams.MustWaitAck ())
            {
              duration += GetSifs ();

      WifiTxVector dataTxVector = GetDataTxVector (m_currentPacket, &m_currentHdr);
      duration += GetSifs ();
      duration += m_phy->CalculateTxDuration (GetSize (m_currentPacket,&m_currentHdr),
                                              dataTxVector, preamble, m_phy->GetFrequency());
      if (m_txParams.MustWaitBasicBlockAck ())
        {
          

        {
          duration += GetSifs ();
          duration += m_phy->CalculateTxDuration (m_txParams.GetNextPacketSize (),
                                                  dataTxVector, preamble, m_phy->GetFrequency());
          if (m_txParams.MustWaitCompressedBlockAck ())
            {
              duration += GetSifs ();


  ForwardDown (packet, &cts, ctsTxVector,preamble);

  Time txDuration = m_phy->CalculateTxDuration (GetCtsSize (), ctsTxVector, preamble, m_phy->GetFrequency());
  txDuration += GetSifs ();
  NS_ASSERT (m_sendDataEvent.IsExpired ());
  

  newDuration += GetSifs ();
  newDuration += GetAckDuration (m_currentHdr.GetAddr1 (), dataTxVector);
  Time txDuration = m_phy->CalculateTxDuration (GetSize (m_currentPacket, &m_currentHdr),
                                                dataTxVector, preamble, m_phy->GetFrequency());
  duration -= txDuration;
  duration -= GetSifs ();


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

Lines 139-145	Link Here

139

      WifiMode mode = phy->GetMode (i);

139

      WifiMode mode = phy->GetMode (i);

140

      WifiTxVector txVector;

140

      WifiTxVector txVector;

141

      txVector.SetMode(mode);

141

      txVector.SetMode(mode);

142

      AddCalcTxTime (mode, phy->CalculateTxDuration (m_pktLen, txVector, WIFI_PREAMBLE_LONG));

142

      AddCalcTxTime (mode, phy->CalculateTxDuration (m_pktLen, txVector, WIFI_PREAMBLE_LONG, phy->GetFrequency()));

143

144

  WifiRemoteStationManager::SetupPhy (phy);

144

  WifiRemoteStationManager::SetupPhy (phy);

145

(-)a/src/wifi/model/wifi-phy.cc (-5 / +9 lines)

Lines 16-21	Link Here

 * 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: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

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

*/

*/

#include "wifi-phy.h"

#include "wifi-phy.h"

Lines 329-335	Link Here

329

330

331

double

332

double

332

WifiPhy::GetPayloadDurationMicroSeconds (uint32_t size, WifiTxVector txvector)

333

WifiPhy::GetPayloadDurationMicroSeconds (uint32_t size, WifiTxVector txvector, double frequency)

333

334

  WifiMode payloadMode=txvector.GetMode();

335

  WifiMode payloadMode=txvector.GetMode();

335

336

Lines 418-425	Link Here

418

         double Nes=1;

419

         double Nes=1;

419

        // IEEE Std 802.11n, section 20.3.11, equation (20-32)

420

        // IEEE Std 802.11n, section 20.3.11, equation (20-32)

420

        uint32_t numSymbols = lrint (m_Stbc*ceil ((16 + size * 8.0 + 6.0*Nes) / (m_Stbc* numDataBitsPerSymbol)));

421

        uint32_t numSymbols = lrint (m_Stbc*ceil ((16 + size * 8.0 + 6.0*Nes) / (m_Stbc* numDataBitsPerSymbol)));

421

422

        return numSymbols * symbolDurationUs;

423

        if (frequency >= 2400 && frequency <= 2500) //at 2.4 GHz

424

          return (numSymbols * symbolDurationUs) + 6;

425

        else  //at 5 GHz

426

          return (numSymbols * symbolDurationUs);

423

427

424

428

425

    case WIFI_MOD_CLASS_DSSS:

429

    case WIFI_MOD_CLASS_DSSS:

Lines 436-449	Link Here

436

440

437

441

438

Time

442

Time

439

WifiPhy::CalculateTxDuration (uint32_t size, WifiTxVector txvector, WifiPreamble preamble)

443

WifiPhy::CalculateTxDuration (uint32_t size, WifiTxVector txvector, WifiPreamble preamble, double frequency)

440

444

441

  WifiMode payloadMode=txvector.GetMode();

445

  WifiMode payloadMode=txvector.GetMode();

442

  double duration = GetPlcpPreambleDurationMicroSeconds (payloadMode, preamble)

446

  double duration = GetPlcpPreambleDurationMicroSeconds (payloadMode, preamble)

443

    + GetPlcpHeaderDurationMicroSeconds (payloadMode, preamble)

447

    + GetPlcpHeaderDurationMicroSeconds (payloadMode, preamble)

444

    + GetPlcpHtSigHeaderDurationMicroSeconds (payloadMode, preamble)

448

    + GetPlcpHtSigHeaderDurationMicroSeconds (payloadMode, preamble)

445

    + GetPlcpHtTrainingSymbolDurationMicroSeconds (payloadMode, preamble,txvector)

449

    + GetPlcpHtTrainingSymbolDurationMicroSeconds (payloadMode, preamble,txvector)

446

    + GetPayloadDurationMicroSeconds (size, txvector);

450

    + GetPayloadDurationMicroSeconds (size, txvector, frequency);

447

  return MicroSeconds (duration);

451

  return MicroSeconds (duration);

448

452

449

453




 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
 * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#ifndef WIFI_PHY_H

   * \return the total amount of time this PHY will stay busy for
   *          the transmission of these bytes.
   */
  static Time CalculateTxDuration (uint32_t size, WifiTxVector txvector, enum WifiPreamble preamble, double frequency);

/** 
   * \param payloadMode the WifiMode use for the transmission of the payload

   * 
   * \return the duration of the payload in microseconds
   */
  static double GetPayloadDurationMicroSeconds (uint32_t size, WifiTxVector txvector, double frequency);

  /**
   * The WifiPhy::GetNModes() and WifiPhy::GetMode() methods are used

(-)a/src/wifi/model/yans-wifi-phy.cc (-2 / +2 lines)

Lines 506-512	Link Here

506

  NS_LOG_FUNCTION (this << packet << rxPowerDbm << txVector.GetMode()<< preamble);

506

  NS_LOG_FUNCTION (this << packet << rxPowerDbm << txVector.GetMode()<< preamble);

507

  rxPowerDbm += m_rxGainDb;

507

  rxPowerDbm += m_rxGainDb;

508

  double rxPowerW = DbmToW (rxPowerDbm);

508

  double rxPowerW = DbmToW (rxPowerDbm);

509

  Time rxDuration = CalculateTxDuration (packet->GetSize (), txVector, preamble);

509

  Time rxDuration = CalculateTxDuration (packet->GetSize (), txVector, preamble, GetFrequency());

510

  WifiMode txMode = txVector.GetMode();

510

  WifiMode txMode = txVector.GetMode();

511

  Time endRx = Simulator::Now () + rxDuration;

511

  Time endRx = Simulator::Now () + rxDuration;

512

Lines 631-637	Link Here

631

      return;

631

      return;

632

633

634

  Time txDuration = CalculateTxDuration (packet->GetSize (), txVector, preamble);

634

  Time txDuration = CalculateTxDuration (packet->GetSize (), txVector, preamble, GetFrequency());

635

  if (m_state->IsStateRx ())

635

  if (m_state->IsStateRx ())

636

637

      m_endRxEvent.Cancel ();

637

      m_endRxEvent.Cancel ();

Return to bug 1971