Attachment #1935 for bug #2028

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

(-)a/src/wifi/model/interference-helper.cc (-4 / +4 lines)

Lines 281-290	Link Here

281

282

283

  WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (payloadMode, preamble);

283

  WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (payloadMode, preamble);

284

  Time plcpHeaderStart = (*j).GetTime () + MicroSeconds (WifiPhy::GetPlcpPreambleDurationMicroSeconds (payloadMode, preamble)); //packet start time+ preamble

284

  Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (payloadMode, preamble); //packet start time+ preamble

285

  Time plcpHsigHeaderStart=plcpHeaderStart+ MicroSeconds (WifiPhy::GetPlcpHeaderDurationMicroSeconds (payloadMode, preamble));//packet start time+ preamble+L SIG

285

  Time plcpHsigHeaderStart=plcpHeaderStart+ WifiPhy::GetPlcpHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG

286

  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + MicroSeconds (WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds (payloadMode, preamble));//packet start time+ preamble+L SIG+HT SIG

286

  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG+HT SIG

287

  Time plcpPayloadStart =plcpHtTrainingSymbolsStart + MicroSeconds (WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds (payloadMode, preamble,event->GetTxVector())); //packet start time+ preamble+L SIG+HT SIG+Training

287

  Time plcpPayloadStart =plcpHtTrainingSymbolsStart + WifiPhy::GetPlcpHtTrainingSymbolDuration (payloadMode, preamble,event->GetTxVector()); //packet start time+ preamble+L SIG+HT SIG+Training

288

  double noiseInterferenceW = (*j).GetDelta ();

288

  double noiseInterferenceW = (*j).GetDelta ();

289

  double powerW = event->GetRxPowerW ();

289

  double powerW = event->GetRxPowerW ();

290

    j++;

290

    j++;

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

Lines 313-319	Link Here

313

void

313

void

314

WifiMacHeader::SetDuration (Time duration)

314

WifiMacHeader::SetDuration (Time duration)

315

316

  int64_t duration_us = duration.GetMicroSeconds ();

316

  int64_t duration_us = ceil((double)duration.GetNanoSeconds ()/1000);

317

  NS_ASSERT (duration_us >= 0 && duration_us <= 0x7fff);

317

  NS_ASSERT (duration_us >= 0 && duration_us <= 0x7fff);

318

  m_duration = static_cast<uint16_t> (duration_us);

318

  m_duration = static_cast<uint16_t> (duration_us);

319




      }
}

Time
WifiPhy::GetPlcpHtTrainingSymbolDuration (WifiMode payloadMode, WifiPreamble preamble, WifiTxVector txvector)
{
  uint8_t Ndltf, Neltf;


  switch (preamble)
    {
     case WIFI_PREAMBLE_HT_MF:
         return MicroSeconds(4 + (4 * Ndltf) + (4 * Neltf));
     case WIFI_PREAMBLE_HT_GF:
	 return MicroSeconds((4 * Ndltf) + (4 * Neltf));
     default:
       // no training for non HT
         return MicroSeconds(0);
    }
}

//return L-SIG
Time
WifiPhy::GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble)
{
         switch (preamble)
            {
             case WIFI_PREAMBLE_HT_MF:
               // HT-SIG
               return MicroSeconds(8);
             case WIFI_PREAMBLE_HT_GF:
               //HT-SIG
               return MicroSeconds(8);
             default:
               // no HT-SIG for non HT
               return MicroSeconds(0);
            }

}

}


Time
WifiPhy::GetPlcpHeaderDuration (WifiMode payloadMode, WifiPreamble preamble)
{
  switch (payloadMode.GetModulationClass ())
    {

            // SERVICE field (which strictly speaking belongs to the PLCP
            // header, see Section 18.3.2 and Figure 18-1) is sent using the
            // payload mode.
            return MicroSeconds(4);
          case 10000000:
            // (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
            return MicroSeconds(8);
          case 5000000:
            // (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
            return MicroSeconds(16);
          }
      }
     //Added by Ghada to support 11n

            {
             case WIFI_PREAMBLE_HT_MF:
               // L-SIG
               return MicroSeconds(4);
             case WIFI_PREAMBLE_HT_GF:
               //L-SIG
               return MicroSeconds(0);
             default:
               // L-SIG
               return MicroSeconds(4);
            }
      }
    case WIFI_MOD_CLASS_ERP_OFDM:
      return MicroSeconds(4);

    case WIFI_MOD_CLASS_DSSS:
      if (preamble == WIFI_PREAMBLE_SHORT)
        {
          // (Section 17.2.2.3 "Short PPDU format" and Figure 17-2 "Short PPDU format"; IEEE Std 802.11-2012)
          return MicroSeconds(24);
        }
      else // WIFI_PREAMBLE_LONG
        {
          // (Section 17.2.2.2 "Long PPDU format" and Figure 17-1 "Short PPDU format"; IEEE Std 802.11-2012)
          return MicroSeconds(48);
        }

    default:
      NS_FATAL_ERROR ("unsupported modulation class");
      return MicroSeconds(0);
    }
}

Time
WifiPhy::GetPlcpPreambleDuration (WifiMode payloadMode, WifiPreamble preamble)
{
  switch (payloadMode.GetModulationClass ())
    {

          default:
            // (Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
            // also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
            return MicroSeconds(16);
          case 10000000:
            // (Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
            // also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
            return MicroSeconds(32);
          case 5000000:
            // (Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
            // also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
            return MicroSeconds(64);
          }
      }
    case WIFI_MOD_CLASS_HT:
      { //IEEE 802.11n Figure 20.1 the training symbols before L_SIG or HT_SIG
           return MicroSeconds(16);
      }
    case WIFI_MOD_CLASS_ERP_OFDM:
      return MicroSeconds(16);

    case WIFI_MOD_CLASS_DSSS:
      if (preamble == WIFI_PREAMBLE_SHORT)
        {
          // (Section 17.2.2.3 "Short PPDU format)" Figure 17-2 "Short PPDU format"; IEEE Std 802.11-2012)
          return MicroSeconds(72);
        }
      else // WIFI_PREAMBLE_LONG
        {
          // (Section 17.2.2.2 "Long PPDU format)" Figure 17-1 "Long PPDU format"; IEEE Std 802.11-2012)
          return MicroSeconds(144);
        }
    default:
      NS_FATAL_ERROR ("unsupported modulation class");
      return MicroSeconds(0);
    }
}

Time
WifiPhy::GetPayloadDuration (uint32_t size, WifiTxVector txvector, double frequency)
{
  WifiMode payloadMode=txvector.GetMode();


      {
        // (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012
        // corresponds to T_{SYM} in the table)
        Time symbolDuration;

        switch (payloadMode.GetBandwidth ())
          {
          case 20000000:
          default:
            symbolDuration = MicroSeconds(4);
            break;
          case 10000000:
            symbolDuration = MicroSeconds(8);
            break;
          case 5000000:
            symbolDuration = MicroSeconds(16);
            break;
          }

        // (Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
        // corresponds to N_{DBPS} in the table
        double numDataBitsPerSymbol = payloadMode.GetDataRate () * symbolDuration.GetNanoSeconds() / 1e9;

        // (Section 18.3.5.4 "Pad bits (PAD)" Equation 18-11; IEEE Std 802.11-2012)
        uint32_t numSymbols = lrint (ceil ((16 + size * 8.0 + 6.0) / numDataBitsPerSymbol));

        // Add signal extension for ERP PHY
        if (payloadMode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM)
          {
            return Time (numSymbols * symbolDuration) + MicroSeconds(6);
          }
        else
          {
            return Time (numSymbols * symbolDuration);
          }
      }
    case WIFI_MOD_CLASS_HT:
      {
         Time symbolDuration;
         double m_Stbc;
        //if short GI data rate is used then symbol duration is 3.6us else symbol duration is 4us
        //In the future has to create a stationmanager that only uses these data rates if sender and reciever support GI
         if (payloadMode.GetUniqueName() == "OfdmRate135MbpsBW40MHzShGi" || payloadMode.GetUniqueName() == "OfdmRate65MbpsBW20MHzShGi" )
           {
             symbolDuration = NanoSeconds(3600);
           }
         else
           {

                  case 90000000:
                  case 120000000:
                  case 150000000:
                    symbolDuration = NanoSeconds(3600);
                    break;               
                 default:
                    symbolDuration = MicroSeconds(4);
              }
           }
         if  (txvector.IsStbc())
            m_Stbc=2;
         else
           m_Stbc=1;
         double numDataBitsPerSymbol = payloadMode.GetDataRate () * txvector.GetNss() * symbolDuration.GetNanoSeconds() / 1e9;
         //check tables 20-35 and 20-36 in the standard to get cases when nes =2
         double Nes=1;
        // IEEE Std 802.11n, section 20.3.11, equation (20-32)

       
        if (frequency >= 2400 && frequency <= 2500) //at 2.4 GHz
          {
            return Time (numSymbols * symbolDuration) + MicroSeconds(6);
          }
        else  //at 5 GHz
          {
            return Time (numSymbols * symbolDuration);
          }
      }
    case WIFI_MOD_CLASS_DSSS:

      NS_LOG_LOGIC (" size=" << size
                             << " mode=" << payloadMode
                             << " rate=" << payloadMode.GetDataRate () );
      return MicroSeconds(lrint (ceil ((size * 8.0) / (payloadMode.GetDataRate () / 1.0e6))));

    default:
      NS_FATAL_ERROR ("unsupported modulation class");
      return MicroSeconds(0);
    }
}

Time
WifiPhy::CalculateTxDuration (uint32_t size, WifiTxVector txvector, WifiPreamble preamble, double frequency)
{
  WifiMode payloadMode = txvector.GetMode();
  Time duration = GetPlcpPreambleDuration (payloadMode, preamble)
    + GetPlcpHeaderDuration (payloadMode, preamble)
    + GetPlcpHtSigHeaderDuration (payloadMode, preamble)
    + GetPlcpHtTrainingSymbolDuration (payloadMode, preamble,txvector)
    + GetPayloadDuration (size, txvector, frequency);
  return duration;
}







   * \return the training symbol duration
   */
  static Time GetPlcpHtTrainingSymbolDuration (WifiMode payloadMode, WifiPreamble preamble, WifiTxVector txvector);
/** 
   * \param payloadMode the WifiMode use for the transmission of the payload
   * \param preamble the type of preamble

   * 
   * \return the duration of the HT-SIG in Mixed Format and greenfield format PLCP header 
   */
  static Time GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble);


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

   * \param payloadMode the WifiMode use for the transmission of the payload
   * \param preamble the type of preamble
   * 
   * \return the duration of the PLCP header
   */
  static Time GetPlcpHeaderDuration (WifiMode payloadMode, WifiPreamble preamble);

  /** 
   * \param payloadMode the WifiMode use for the transmission of the payload
   * \param preamble the type of preamble 
   * 
   * \return the duration of the PLCP preamble
   */
  static Time GetPlcpPreambleDuration (WifiMode payloadMode, WifiPreamble preamble);

  /** 
   * \param size the number of bytes in the packet to send
   * \param txvector the transmission parameters used for this packet
   * \param frequency the channel center frequency (MHz)
   * 
   * \return the duration of the payload
   */
  static Time GetPayloadDuration (uint32_t size, WifiTxVector txvector, double frequency);

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




    {
      testedFrequency = CHANNEL_36_MHZ;
    }
  double calculatedDurationMicroSeconds = WifiPhy::GetPayloadDuration (size, txVector, testedFrequency).GetMicroSeconds();
  if (calculatedDurationMicroSeconds != knownDurationMicroSeconds)
    {
      std::cerr << " size=" << size

    {
      // Durations vary depending on frequency; test also 2.4 GHz (bug 1971)
      testedFrequency = CHANNEL_1_MHZ;
      calculatedDurationMicroSeconds = WifiPhy::GetPayloadDuration (size, txVector, testedFrequency).GetMicroSeconds();
      if (calculatedDurationMicroSeconds != knownDurationMicroSeconds + 6)
        {
          std::cerr << " size=" << size

  retval = retval
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate65MbpsBW20MHz (), WIFI_PREAMBLE_HT_MF,228) 
    && CheckTxDuration (76, WifiPhy::GetOfdmRate65MbpsBW20MHz (), WIFI_PREAMBLE_HT_MF,48)
    && CheckTxDuration (14, WifiPhy::GetOfdmRate65MbpsBW20MHz (), WIFI_PREAMBLE_HT_MF,40)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate65MbpsBW20MHz (), WIFI_PREAMBLE_HT_GF,220) 
    && CheckTxDuration (76, WifiPhy::GetOfdmRate65MbpsBW20MHz (), WIFI_PREAMBLE_HT_GF,40)
    && CheckTxDuration (14, WifiPhy::GetOfdmRate65MbpsBW20MHz (), WIFI_PREAMBLE_HT_GF,32)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate7_2MbpsBW20MHz (), WIFI_PREAMBLE_HT_MF,1746) 
    && CheckTxDuration (76, WifiPhy::GetOfdmRate7_2MbpsBW20MHz (), WIFI_PREAMBLE_HT_MF,126)
    && CheckTxDuration (14, WifiPhy::GetOfdmRate7_2MbpsBW20MHz (), WIFI_PREAMBLE_HT_MF,57.6)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate7_2MbpsBW20MHz (), WIFI_PREAMBLE_HT_GF,1738) 
    && CheckTxDuration (76, WifiPhy::GetOfdmRate7_2MbpsBW20MHz (), WIFI_PREAMBLE_HT_GF,118)
    && CheckTxDuration (14, WifiPhy::GetOfdmRate7_2MbpsBW20MHz (), WIFI_PREAMBLE_HT_GF,49.6)
    && CheckTxDuration (1536, WifiPhy::GetOfdmRate65MbpsBW20MHzShGi (), WIFI_PREAMBLE_HT_MF,226.8)
    && CheckTxDuration (76, WifiPhy::GetOfdmRate65MbpsBW20MHzShGi (), WIFI_PREAMBLE_HT_MF,46.8)
    && CheckTxDuration (14, WifiPhy::GetOfdmRate65MbpsBW20MHzShGi (), WIFI_PREAMBLE_HT_MF,39.6)
    && CheckTxDuration (1536, WifiPhy::GetOfdmRate65MbpsBW20MHzShGi (), WIFI_PREAMBLE_HT_GF,218.8)
    && CheckTxDuration (76, WifiPhy::GetOfdmRate65MbpsBW20MHzShGi (), WIFI_PREAMBLE_HT_GF,38.8)
    && CheckTxDuration (14, WifiPhy::GetOfdmRate65MbpsBW20MHzShGi (), WIFI_PREAMBLE_HT_GF,31.6)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate135MbpsBW40MHz (), WIFI_PREAMBLE_HT_MF,128)
    && CheckTxDuration (76,WifiPhy::GetOfdmRate135MbpsBW40MHz (), WIFI_PREAMBLE_HT_MF,44)
    && CheckTxDuration (14,WifiPhy::GetOfdmRate135MbpsBW40MHz (), WIFI_PREAMBLE_HT_MF,40)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate135MbpsBW40MHz (), WIFI_PREAMBLE_HT_GF,120)
    && CheckTxDuration (76,WifiPhy::GetOfdmRate135MbpsBW40MHz (), WIFI_PREAMBLE_HT_GF,36)
    && CheckTxDuration (14,WifiPhy::GetOfdmRate135MbpsBW40MHz (), WIFI_PREAMBLE_HT_GF,32)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate150MbpsBW40MHz (), WIFI_PREAMBLE_HT_MF,118.8)
    && CheckTxDuration (76,WifiPhy::GetOfdmRate150MbpsBW40MHz (), WIFI_PREAMBLE_HT_MF,43.2)
    && CheckTxDuration (14,WifiPhy::GetOfdmRate150MbpsBW40MHz (), WIFI_PREAMBLE_HT_MF,39.6)
    && CheckTxDuration (1536,WifiPhy::GetOfdmRate150MbpsBW40MHz (), WIFI_PREAMBLE_HT_GF,110.8)
    && CheckTxDuration (76,WifiPhy::GetOfdmRate150MbpsBW40MHz (), WIFI_PREAMBLE_HT_GF,35.2)
    && CheckTxDuration (14,WifiPhy::GetOfdmRate150MbpsBW40MHz (), WIFI_PREAMBLE_HT_GF,31.6);

    NS_TEST_EXPECT_MSG_EQ (retval, true, "an 802.11n duration failed");
}

Return to bug 2028