Attachment #1248 for bug #1271

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

(-)a/CHANGES.html (+7 lines)

Lines 86-91	Link Here

<li> WIFI_PHY_STANDARD_80211_10Mhz was changed to WIFI_PHY_STANDARD_80211_10MHZ

<li> WIFI_PHY_STANDARD_80211_10Mhz was changed to WIFI_PHY_STANDARD_80211_10MHZ

<li> WIFI_PHY_STANDARD_80211_5Mhz was changed to WIFI_PHY_STANDARD_80211_5MHZ

<li> WIFI_PHY_STANDARD_80211_5Mhz was changed to WIFI_PHY_STANDARD_80211_5MHZ

</ul>

</ul>

<li> In the SpectrumPhy base class, the methods to get/set the

  MobilityModel and the NetDevice were previously working with

  opaque Ptr&#60;Object&#62;. Now all these methods have been

  changed so that they work with Ptr&#60;NetDevice&#62;

  and Ptr&#60;MobilityModel&#62; as appropriate. See <A href="https://www.nsnam.org/bugzilla/show_bug.cgi?id=1271">Bug 1271</A> on

  bugzilla for the motivation.

</li>

</ul>

</ul>

<h2>Changed behavior:</h2>

<h2>Changed behavior:</h2>







Ptr<NetDevice>
LteSpectrumPhy::GetDevice ()
{
  NS_LOG_FUNCTION (this);

}


Ptr<MobilityModel>
LteSpectrumPhy::GetMobility ()
{
  NS_LOG_FUNCTION (this);



void
LteSpectrumPhy::SetDevice (Ptr<NetDevice> d)
{
  NS_LOG_FUNCTION (this << d);
  m_device = d;



void
LteSpectrumPhy::SetMobility (Ptr<MobilityModel> m)
{
  NS_LOG_FUNCTION (this << m);
  m_mobility = m;





  // inherited from SpectrumPhy
  void SetChannel (Ptr<SpectrumChannel> c);
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
  Ptr<NetDevice> GetDevice ();
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

  /**


  EventId m_endRxEventId;

  Ptr<MobilityModel> m_mobility;

  Ptr<NetDevice> m_device;

  Ptr<SpectrumChannel> m_channel;


(-)a/src/spectrum/helper/adhoc-aloha-noack-ideal-phy-helper.cc (-1 / +1 lines)

Lines 113-119	Link Here

113

      dev->SetPhy (phy);

113

      dev->SetPhy (phy);

114

115

      NS_ASSERT (node);

115

      NS_ASSERT (node);

116

      phy->SetMobility (node);

116

      phy->SetMobility (node->GetObject<MobilityModel> ());

117

118

      NS_ASSERT (dev);

118

      NS_ASSERT (dev);

119

      phy->SetDevice (dev);

119

      phy->SetDevice (dev);

(-)a/src/spectrum/helper/spectrum-analyzer-helper.cc (-1 / +1 lines)

Lines 142-148	Link Here

142

      dev->SetPhy (phy);

142

      dev->SetPhy (phy);

143

144

      NS_ASSERT (node);

144

      NS_ASSERT (node);

145

      phy->SetMobility (node);

145

      phy->SetMobility (node->GetObject<MobilityModel> ());

146

147

      NS_ASSERT (dev);

147

      NS_ASSERT (dev);

148

      phy->SetDevice (dev);

148

      phy->SetDevice (dev);

(-)a/src/spectrum/helper/spectrum-helper.cc (-1 / +1 lines)

Lines 215-221	Link Here

215

  NS_ASSERT (m_channel);

215

  NS_ASSERT (m_channel);

216

  Ptr<SpectrumPhy> phy = (m_phy.Create ())->GetObject<SpectrumPhy> ();

216

  Ptr<SpectrumPhy> phy = (m_phy.Create ())->GetObject<SpectrumPhy> ();

217

  phy->SetChannel (m_channel);

217

  phy->SetChannel (m_channel);

218

  phy->SetMobility (node);

218

  phy->SetMobility (node->GetObject<MobilityModel> ());

219

  phy->SetDevice (device);

219

  phy->SetDevice (device);

220

  return phy;

220

  return phy;

221

(-)a/src/spectrum/helper/waveform-generator-helper.cc (-1 / +1 lines)

Lines 98-104	Link Here

      dev->SetPhy (phy);

      dev->SetPhy (phy);

100

      NS_ASSERT (node);

100

      NS_ASSERT (node);

101

      phy->SetMobility (node);

101

      phy->SetMobility (node->GetObject<MobilityModel> ());

102

103

      NS_ASSERT (dev);

103

      NS_ASSERT (dev);

104

      phy->SetDevice (dev);

104

      phy->SetDevice (dev);







Ptr<NetDevice>
HalfDuplexIdealPhy::GetDevice ()
{
  NS_LOG_FUNCTION (this);

}


Ptr<MobilityModel>
HalfDuplexIdealPhy::GetMobility ()
{
  NS_LOG_FUNCTION (this);



void
HalfDuplexIdealPhy::SetDevice (Ptr<NetDevice> d)
{
  NS_LOG_FUNCTION (this << d);
  m_netDevice = d;



void
HalfDuplexIdealPhy::SetMobility (Ptr<MobilityModel> m)
{
  NS_LOG_FUNCTION (this << m);
  m_mobility = m;





  // inherited from SpectrumPhy
  void SetChannel (Ptr<SpectrumChannel> c);
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
  Ptr<NetDevice> GetDevice ();
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  void StartRx (Ptr<PacketBurst> p, Ptr <const SpectrumValue> rxPsd, SpectrumType st, Time duration);



  EventId m_endRxEventId;

  Ptr<MobilityModel> m_mobility;
  Ptr<NetDevice> m_netDevice;
  Ptr<SpectrumChannel> m_channel;

  Ptr<SpectrumValue> m_txPsd;




  NS_ASSERT (originalTxPowerSpectrum);


  Ptr<MobilityModel> txMobility = txPhy->GetMobility ();
  SpectrumModelUid_t txSpectrumModelUid = originalTxPowerSpectrum->GetSpectrumModelUid ();
  NS_LOG_LOGIC (" txSpectrumModelUid " << txSpectrumModelUid);


              Ptr <SpectrumValue> rxPowerSpectrum = convertedTxPowerSpectrum->Copy ();
              Time delay = MicroSeconds (0); 

              Ptr<MobilityModel> receiverMobility = (*rxPhyIterator)->GetMobility ();

              if (txMobility && receiverMobility)
                {

                }

              Ptr<PacketBurst> pktBurstCopy = p->Copy ();
              Ptr<NetDevice> netDev = (*rxPhyIterator)->GetDevice ();
              if (netDev)
                {
                  // the receiver has a NetDevice, so we expect that it is attached to a Node
                  uint32_t dstNode =  netDev->GetNode ()->GetId ();
                  Simulator::ScheduleWithContext (dstNode, delay, &MultiModelSpectrumChannel::StartRx, this,
                                                  pktBurstCopy, rxPowerSpectrum, st, duration, *rxPhyIterator);
                }

Ptr<NetDevice>
MultiModelSpectrumChannel::GetDevice (uint32_t i) const
{
  return m_phyVector.at (i)->GetDevice ();
}









  Ptr<MobilityModel> senderMobility = txPhy->GetMobility ();

  for (PhyList::const_iterator rxPhyIterator = m_phyList.begin ();
       rxPhyIterator != m_phyList.end ();

          Ptr <SpectrumValue> rxPsd = Copy<SpectrumValue> (txPsd);
          Time delay  = MicroSeconds (0);

          Ptr<MobilityModel> receiverMobility = (*rxPhyIterator)->GetMobility ();

          if (senderMobility && receiverMobility)
            {

            }

          Ptr<PacketBurst> pktBurstCopy = p->Copy ();
          Ptr<NetDevice> netDev = (*rxPhyIterator)->GetDevice ();
          if (netDev)
            {
              // the receiver has a NetDevice, so we expect that it is attached to a Node
              uint32_t dstNode =  netDev->GetNode ()->GetId ();
              Simulator::ScheduleWithContext (dstNode, delay, &SingleModelSpectrumChannel::StartRx, this,
                                              pktBurstCopy, rxPsd, st, duration, *rxPhyIterator);
            }







Ptr<NetDevice>
SpectrumAnalyzer::GetDevice ()
{
  return m_netDevice;
}


Ptr<MobilityModel>
SpectrumAnalyzer::GetMobility ()
{
  return m_mobility;

}

void
SpectrumAnalyzer::SetDevice (Ptr<NetDevice> d)
{
  NS_LOG_FUNCTION (this << d);
  m_netDevice = d;



void
SpectrumAnalyzer::SetMobility (Ptr<MobilityModel> m)
{
  NS_LOG_FUNCTION (this << m);
  m_mobility = m;





// inherited from SpectrumPhy
  void SetChannel (Ptr<SpectrumChannel> c);
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
  Ptr<NetDevice> GetDevice ();
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  void StartRx (Ptr<PacketBurst> pb, Ptr <const SpectrumValue> rxPowerSpectralDensity, SpectrumType st, Time duration);


  void DoDispose ();

private:
  Ptr<MobilityModel> m_mobility;
  Ptr<NetDevice> m_netDevice;
  Ptr<SpectrumChannel> m_channel;

  virtual void GenerateReport ();




   *
   * @param d the NetDevice instance
   */
  virtual void SetDevice (Ptr<NetDevice> d) = 0;

  /**
   * get the associated NetDevice instance
   *
   * @return a Ptr to the associated NetDevice instance
   */
  virtual Ptr<NetDevice> GetDevice () = 0;

  /**
   * Set the mobility model associated with this device.
   *
   * @param m the mobility model
   */
  virtual void SetMobility (Ptr<MobilityModel> m) = 0;

  /**
   * get the associated MobilityModel instance
   *
   * @return a Ptr to the associated NetDevice instance
   */
  virtual Ptr<MobilityModel> GetMobility () = 0;


  /**







Ptr<NetDevice>
WaveformGenerator::GetDevice ()
{
  return m_netDevice;
}


Ptr<MobilityModel>
WaveformGenerator::GetMobility ()
{
  return m_mobility;

}

void
WaveformGenerator::SetDevice (Ptr<NetDevice> d)
{
  m_netDevice = d;
}


void
WaveformGenerator::SetMobility (Ptr<MobilityModel> m)
{
  m_mobility = m;
}





  // inherited from SpectrumPhy
  void SetChannel (Ptr<SpectrumChannel> c);
  void SetMobility (Ptr<MobilityModel> m);
  void SetDevice (Ptr<NetDevice> d);
  Ptr<MobilityModel> GetMobility ();
  Ptr<NetDevice> GetDevice ();
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
  void StartRx (Ptr<PacketBurst> p, Ptr <const SpectrumValue> rxPsd, SpectrumType st, Time duration);


private:
  virtual void DoDispose (void);

  Ptr<MobilityModel> m_mobility;
  Ptr<NetDevice> m_netDevice;
  Ptr<SpectrumChannel> m_channel;

  virtual void GenerateWaveform ();

Return to bug 1271