Attachment #2784 for bug #2460

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

(-)a/examples/wireless/wifi-clear-channel-cmu.cc (-1 / +1 lines)

Lines 204-210	Link Here

204

205

          NS_LOG_DEBUG (modes[i]);

205

          NS_LOG_DEBUG (modes[i]);

206

          experiment = Experiment (modes[i]);

206

          experiment = Experiment (modes[i]);

207

          wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-110.0) );

207

          wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-110.0) );

208

          wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0) );

208

          wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0) );

209

          wifiPhy.Set ("TxPowerStart", DoubleValue (15.0) );

209

          wifiPhy.Set ("TxPowerStart", DoubleValue (15.0) );

210

          wifiPhy.Set ("TxPowerEnd", DoubleValue (15.0) );

210

          wifiPhy.Set ("TxPowerEnd", DoubleValue (15.0) );

(-)a/examples/wireless/wifi-simple-interference.cc (-1 / +1 lines)

Lines 201-207	Link Here

201

  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));

201

  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));

202

  // This will disable these sending devices from detecting a signal

202

  // This will disable these sending devices from detecting a signal

203

  // so that they do not backoff

203

  // so that they do not backoff

204

  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );

204

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (0.0) );

205

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

205

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

206

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

206

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

207

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

207

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

(-)a/examples/wireless/wifi-tcp.cc (-1 / +1 lines)

Lines 101-107	Link Here

101

  wifiPhy.Set ("RxGain", DoubleValue (0));

101

  wifiPhy.Set ("RxGain", DoubleValue (0));

102

  wifiPhy.Set ("RxNoiseFigure", DoubleValue (10));

102

  wifiPhy.Set ("RxNoiseFigure", DoubleValue (10));

103

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-79));

103

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-79));

104

  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-79 + 3));

104

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-79 + 3));

105

  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");

105

  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");

106

  wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

106

  wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

107

                                      "DataMode", StringValue (phyRate),

107

                                      "DataMode", StringValue (phyRate),

(-)a/src/aodv/test/aodv-regression.cc (+1 lines)

Lines 162-167	Link Here

162

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

162

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

163

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

163

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

164

  wifiPhy.SetChannel (chan);

164

  wifiPhy.SetChannel (chan);

165

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-92.0)); //this configuration should go away in future revision to the test

165

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

166

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

166

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

167

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

167

  // This test suite output was originally based on YansErrorRateModel

168

  // This test suite output was originally based on YansErrorRateModel

(-)a/src/aodv/test/bug-772.cc (+2 lines)

Lines 134-139	Link Here

134

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

134

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

135

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

135

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

136

  wifiPhy.SetChannel (chan);

136

  wifiPhy.SetChannel (chan);

137

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-92.0)); //this configuration should go away in future revision to the test

138

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-91.0)); //this configuration should go away in future revision to the test

137

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

139

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

138

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

140

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

139

  WifiHelper wifi;

141

  WifiHelper wifi;

(-)a/src/mesh/test/dot11s/hwmp-proactive-regression.cc (+1 lines)

Lines 113-118	Link Here

113

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

113

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

114

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

114

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

115

  wifiPhy.SetChannel (chan);

115

  wifiPhy.SetChannel (chan);

116

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-98.0)); //this configuration should go away in future revision to the test

116

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

117

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

117

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

118

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

118

  // 2. setup mesh

119

  // 2. setup mesh

(-)a/src/mesh/test/dot11s/hwmp-reactive-regression.cc (+3 lines)

Lines 114-119	Link Here

114

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

114

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

115

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

115

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

116

  wifiPhy.SetChannel (chan);

116

  wifiPhy.SetChannel (chan);

117

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-94.0)); //this configuration should go away in future revision to the test

118

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-94.0)); //this configuration should go away in future revision to the test

119

  wifiPhy.Set ("SensitivityThreshold", DoubleValue (-109.0)); //this configuration should go away in future revision to the test

117

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

120

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

118

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

121

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

119

122

(-)a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc (+1 lines)

Lines 140-145	Link Here

140

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

140

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

141

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

141

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

142

  wifiPhy.SetChannel (chan);

142

  wifiPhy.SetChannel (chan);

143

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-98.0)); //this configuration should go away in future revision to the test

143

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

144

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

144

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

145

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

145

  // 2. setup mesh

146

  // 2. setup mesh

(-)a/src/mesh/test/flame/flame-regression.cc (+1 lines)

Lines 99-104	Link Here

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

100

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

100

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

101

  wifiPhy.SetChannel (chan);

101

  wifiPhy.SetChannel (chan);

102

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-94.0)); //this configuration should go away in future revision to the test

102

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

103

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

103

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

104

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

104

  // 2. setup mesh

105

  // 2. setup mesh

(-)a/src/test/ns3wifi/wifi-interference-test-suite.cc (-1 / +1 lines)

Lines 190-196	Link Here

190

191

  // This will disable these sending devices from detecting a signal

191

  // This will disable these sending devices from detecting a signal

192

  // so that they do not backoff

192

  // so that they do not backoff

193

  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );

193

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (0.0) );

194

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

194

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

195

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

195

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

196

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

196

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

(-)a/src/wave/test/ocb-test-suite.cc (-1 / +1 lines)

Lines 331-337	Link Here

331

  Simulator::Destroy ();

331

  Simulator::Destroy ();

332

  NS_TEST_ASSERT_MSG_LT (phyrx_time, macassoc_time, "In Sta mode with AP, you cannot associate until receive beacon or AssocResponse frame" );

332

  NS_TEST_ASSERT_MSG_LT (phyrx_time, macassoc_time, "In Sta mode with AP, you cannot associate until receive beacon or AssocResponse frame" );

333

  NS_TEST_ASSERT_MSG_LT (macassoc_time, phytx_time, "In Sta mode with AP,  you cannot send data packet until associate" );

333

  NS_TEST_ASSERT_MSG_LT (macassoc_time, phytx_time, "In Sta mode with AP,  you cannot send data packet until associate" );

334

  NS_TEST_ASSERT_MSG_GT ((phyrx_pos.x - macassoc_pos.x), 0.0, "");

334

  NS_TEST_ASSERT_MSG_GT_OR_EQ ((phyrx_pos.x - macassoc_pos.x), 0.0, "");

335

  //actually macassoc_pos.x - phytx_pos.x is greater than 0

335

  //actually macassoc_pos.x - phytx_pos.x is greater than 0

336

  //however associate switch to send is so fast with less than 100ms

336

  //however associate switch to send is so fast with less than 100ms

337

  //and in our mobility model that every 0.1s update position,

337

  //and in our mobility model that every 0.1s update position,

(-)a/src/wifi/examples/wifi-manager-example.cc (-1 / +1 lines)

Lines 313-319	Link Here

313

  wifi.SetStandard (serverSelectedStandard.m_standard);

313

  wifi.SetStandard (serverSelectedStandard.m_standard);

314

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

314

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

315

  wifiPhy.Set ("RxNoiseFigure", DoubleValue (0.0));

315

  wifiPhy.Set ("RxNoiseFigure", DoubleValue (0.0));

316

  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-110.0));

316

  wifiPhy.Set ("SignalDetectionThreshold", DoubleValue (-110.0));

317

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0));

317

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0));

318

319

  Ptr<YansWifiChannel> wifiChannel = CreateObject<YansWifiChannel> ();

319

  Ptr<YansWifiChannel> wifiChannel = CreateObject<YansWifiChannel> ();

(-)a/src/wifi/model/spectrum-wifi-phy.cc (+7 lines)

Lines 174-179	Link Here

174

  NS_LOG_DEBUG ("Signal power received (watts) before antenna gain: " << Integral (filteredSignal));

174

  NS_LOG_DEBUG ("Signal power received (watts) before antenna gain: " << Integral (filteredSignal));

175

  double rxPowerW = Integral (filteredSignal) * DbToRatio (GetRxGain ());

175

  double rxPowerW = Integral (filteredSignal) * DbToRatio (GetRxGain ());

176

  NS_LOG_DEBUG ("Signal power received after antenna gain: " << rxPowerW << " W (" << WToDbm (rxPowerW) << " dBm)");

176

  NS_LOG_DEBUG ("Signal power received after antenna gain: " << rxPowerW << " W (" << WToDbm (rxPowerW) << " dBm)");

177

178

  if (WToDbm (rxPowerW) < GetSensitivityThreshold ())

179

180

      //ignore this signal

181

      NS_LOG_DEBUG ("Signal power received is below the sensitivity threshold -> ignore this signal!");

182

      return;

183

177

184

178

  Ptr<WifiSpectrumSignalParameters> wifiRxParams = DynamicCast<WifiSpectrumSignalParameters> (rxParams);

185

  Ptr<WifiSpectrumSignalParameters> wifiRxParams = DynamicCast<WifiSpectrumSignalParameters> (rxParams);

179

186




                   MakeUintegerAccessor (&WifiPhy::SetChannelNumber,
                                         &WifiPhy::GetChannelNumber),
                   MakeUintegerChecker<uint8_t> (0, 196))
    .AddAttribute ("SignalDetectionThreshold",
                   "The energy of a received signal should be higher than "
                   "this threshold (dbm) to allow the PHY layer to detect the signal.",
                   DoubleValue (-91.0),
                   MakeDoubleAccessor (&WifiPhy::SetSignalDetectionThreshold,
                                       &WifiPhy::GetSignalDetectionThreshold),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("CcaMode1Threshold",
                   "The energy of a received signal should be higher than "
                   "this threshold (dbm) to allow the PHY layer to declare CCA BUSY state.",
                   DoubleValue (-62.0),
                   MakeDoubleAccessor (&WifiPhy::SetCcaMode1Threshold,
                                       &WifiPhy::GetCcaMode1Threshold),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("SensitivityThreshold",
                   "The energy of a received signal should be higher than "
                   "this threshold (dbm) to allow the PHY layer to accept this signal.",
                   DoubleValue (-101.0),
                   MakeDoubleAccessor (&WifiPhy::SetSensitivityThreshold,
                                       &WifiPhy::GetSensitivityThreshold),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("TxGain",
                   "Transmission gain (dB).",
                   DoubleValue (0.0),

}

void
WifiPhy::SetSignalDetectionThreshold (double threshold)
{
  NS_LOG_FUNCTION (this << threshold);
  m_signalDetectionThresholdW = DbmToW (threshold);
}

double
WifiPhy::GetSignalDetectionThresholdW (void) const
{
  return m_signalDetectionThresholdW;
}

double
WifiPhy::GetSignalDetectionThreshold (void) const
{
  return WToDbm (m_signalDetectionThresholdW);
}

void

}

void
WifiPhy::SetSensitivityThreshold (double threshold)
{
  NS_LOG_FUNCTION (this << threshold);
  m_sensitivityThresholdW = DbmToW (threshold);
}

double
WifiPhy::GetSensitivityThreshold (void) const
{
  return WToDbm (m_sensitivityThresholdW);
}

void
WifiPhy::SetRxNoiseFigure (double noiseFigureDb)
{
  NS_LOG_FUNCTION (this << noiseFigureDb);

  NS_ASSERT_MSG (channelwidth == 5 || channelwidth == 10 || channelwidth == 20 || channelwidth == 22 || channelwidth == 40 || channelwidth == 80 || channelwidth == 160, "wrong channel width value");
  m_channelWidth = channelwidth;
  AddSupportedChannelWidth (channelwidth);
  if (GetCcaMode1Threshold () == 0)
    {
      //todo: what if channel width has changed but we already set CCAMode1 threshold value?
      switch (channelwidth)
        {
        case 5:
          SetCcaMode1Threshold (-68);
          break;
        case 10:
          SetCcaMode1Threshold (-65);
          break;
        case 20:
        default:
          SetCcaMode1Threshold (-62);
          break;
        //todo: other cases (DSSS, channel bonding, ...)
        }
    }
}

uint8_t

  //This function should be later split to check separately whether plcp preamble and plcp header can be successfully received.
  //Note: plcp preamble reception is not yet modeled.
  NS_LOG_FUNCTION (this << packet << WToDbm (rxPowerW) << rxDuration);
  
  if (WToDbm (rxPowerW) < GetSensitivityThreshold ())
    {
      //ignore this signal
      NS_LOG_DEBUG ("Signal power received is below the sensitivity threshold: ignore this signal!");
      return;
    }
  
  AmpduTag ampduTag;
  Time endRx = Simulator::Now () + rxDuration;


      break;
    case WifiPhy::CCA_BUSY:
    case WifiPhy::IDLE:
      if (rxPowerW > GetSignalDetectionThresholdW ()) //checked here, no need to check in the payload reception (current implementation assumes constant rx power over the packet duration)
        {
          if (preamble == WIFI_PREAMBLE_NONE && (m_mpdusNum == 0 || m_plcpSuccess == false))
            {

      else
        {
          NS_LOG_DEBUG ("drop packet because signal power too Small (" <<
                        rxPowerW << "<" << GetSignalDetectionThresholdW () << ")");
          NotifyRxDrop (packet);
          m_plcpSuccess = false;
          goto maybeCcaBusy;




  virtual int64_t AssignStreams (int64_t stream);

  /**
   * Sets the signal detection threshold (dBm).
   * The energy of a received signal should be higher than
   * this threshold (dbm) to allow the PHY layer to detect the signal.
   *
   * \param threshold the energy detction threshold in dBm
   */
  void SetSignalDetectionThreshold (double threshold);
  /**
   * Return the signal detection threshold (dBm).
   *
   * \return the signal detection threshold in dBm
   */
  double GetSignalDetectionThreshold (void) const;
  /**
   * Return the signal detection threshold.
   *
   * \return the signal detection threshold.
   */
  double GetSignalDetectionThresholdW (void) const;
  /**
   * Sets the CCA threshold (dBm). The energy of a received signal
   * should be higher than this threshold to allow the PHY

   */
  double GetCcaMode1Threshold (void) const;
  /**
   * Sets the sensitivity threshold (dBm). 
   * The energy of a received signal should be higher than this 
   * threshold to allow the PHY layer to accept the signal.
   *
   * \param threshold the sensitivity threshold in dBm
   */
  void SetSensitivityThreshold (double threshold);
  /**
   * Return the sensitivity threshold (dBm).
   *
   * \return the sensitivity threshold in dBm
   */
  double GetSensitivityThreshold (void) const;
  /**
   * Sets the RX loss (dB) in the Signal-to-Noise-Ratio due to non-idealities in the receiver.
   *
   * \param noiseFigureDb noise figure in dB

  bool m_frequencyChannelNumberInitialized; //!< Store initialization state
  uint8_t m_channelWidth;             //!< Channel width

  double   m_ccaMode1ThresholdW;        //!< Clear channel assessment (CCA) threshold in watts
  double   m_signalDetectionThresholdW; //!< Signal detection threshold in watts
  double   m_sensitivityThresholdW;     //!< Receiver sensitivity threshold in watts

  double   m_txGainDb;            //!< Transmission gain (dB)
  double   m_rxGainDb;            //!< Reception gain (dB)
  double   m_txPowerBaseDbm;      //!< Minimum transmission power (dBm)

Return to bug 2460