Attachment #1872 for bug #1974

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

(-)a/src/csma/model/csma-net-device.cc (-2 / +2 lines)

Lines 490-496	Link Here

490

          m_txMachineState = BUSY;

490

          m_txMachineState = BUSY;

491

          m_phyTxBeginTrace (m_currentPkt);

491

          m_phyTxBeginTrace (m_currentPkt);

492

493

          Time tEvent = Seconds (m_bps.CalculateTxTime (m_currentPkt->GetSize ()));

493

          Time tEvent = m_bps.CalculateBytesTxTime (m_currentPkt->GetSize ());

494

          NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << tEvent.GetSeconds () << "sec");

494

          NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << tEvent.GetSeconds () << "sec");

495

          Simulator::Schedule (tEvent, &CsmaNetDevice::TransmitCompleteEvent, this);

495

          Simulator::Schedule (tEvent, &CsmaNetDevice::TransmitCompleteEvent, this);

496

Lines 626-632	Link Here

626

//

626

//

627

  // We use the Ethernet interframe gap of 96 bit times.

627

  // We use the Ethernet interframe gap of 96 bit times.

628

//

628

//

629

  m_tInterframeGap = Seconds (m_bps.CalculateTxTime (96/8));

629

  m_tInterframeGap = m_bps.CalculateBytesTxTime (96/8);

630

631

//

631

//

632

  // This device is up whenever a channel is attached to it.

632

  // This device is up whenever a channel is attached to it.




  return static_cast<double>(bytes)*8/m_bps;
}

Time DataRate::CalculateBytesTxTime (uint32_t bytes) const
{
  NS_LOG_FUNCTION (this << bytes);
  // \todo avoid to use double (if possible).
  return Seconds (static_cast<double>(bytes)*8/m_bps);
}

Time DataRate::CalculateBitsTxTime (uint32_t bits) const
{
  NS_LOG_FUNCTION (this << bits);
  // \todo avoid to use double (if possible).
  return Seconds (static_cast<double>(bits)/m_bps);
}

uint64_t DataRate::GetBitRate () const
{
  NS_LOG_FUNCTION (this);




#include "ns3/nstime.h"
#include "ns3/attribute.h"
#include "ns3/attribute-helper.h"
#include "ns3/deprecated.h"

namespace ns3 {


 * from strings, natural multiplication e.g.:
 * \code
 * DataRate x("56kbps");
 * double nBits = x*ns3::Seconds (19.2);
 * uint32_t nBytes = 20;
 * Time txTime = x.CalclulateBytesTxTime (nBytes);
 * \endcode
 * This class also supports the regular comparison operators <, >, <=, >=, ==,
 * and !=

   *
   * Calculates the transmission time at this data rate
   * \param bytes The number of bytes (not bits) for which to calculate
   * \return The transmission time for the number of bytes specified
   */
  Time CalculateBytesTxTime (uint32_t bytes) const;

  /**
   * \brief Calculate transmission time
   *
   * Calculates the transmission time at this data rate
   * \param bits The number of bits (not bytes) for which to calculate
   * \return The transmission time for the number of bits specified
   */
  Time CalculateBitsTxTime (uint32_t bits) const;

  /**
   * \brief Calculate transmission time
   *
   * Calculates the transmission time at this data rate
   * \param bytes The number of bytes (not bits) for which to calculate
   * \return The transmission time in seconds for the number of bytes specified
   */
  double CalculateTxTime (uint32_t bytes) const NS_DEPRECATED;

  /**
   * Get the underlying bitrate

(-)a/src/network/utils/simple-net-device.cc (-2 / +2 lines)

Lines 420-426	Link Here

420

          Time txTime = Time (0);

420

          Time txTime = Time (0);

421

          if (m_bps > DataRate (0))

421

          if (m_bps > DataRate (0))

422

423

              txTime = Seconds (m_bps.CalculateTxTime (packet->GetSize ()));

423

              txTime = m_bps.CalculateBytesTxTime (packet->GetSize ());

424

425

          m_channel->Send (p, protocolNumber, to, from, this);

425

          m_channel->Send (p, protocolNumber, to, from, this);

426

          TransmitCompleteEvent = Simulator::Schedule (txTime, &SimpleNetDevice::TransmitComplete, this);

426

          TransmitCompleteEvent = Simulator::Schedule (txTime, &SimpleNetDevice::TransmitComplete, this);

Lines 460-466	Link Here

460

      Time txTime = Time (0);

460

      Time txTime = Time (0);

461

      if (m_bps > DataRate (0))

461

      if (m_bps > DataRate (0))

462

463

          txTime = Seconds (m_bps.CalculateTxTime (packet->GetSize ()));

463

          txTime = m_bps.CalculateBytesTxTime (packet->GetSize ());

464

465

      TransmitCompleteEvent = Simulator::Schedule (txTime, &SimpleNetDevice::TransmitComplete, this);

465

      TransmitCompleteEvent = Simulator::Schedule (txTime, &SimpleNetDevice::TransmitComplete, this);

466

(-)a/src/point-to-point/model/point-to-point-net-device.cc (-1 / +1 lines)

Lines 218-224	Link Here

218

  m_currentPkt = p;

218

  m_currentPkt = p;

219

  m_phyTxBeginTrace (m_currentPkt);

219

  m_phyTxBeginTrace (m_currentPkt);

220

221

  Time txTime = Seconds (m_bps.CalculateTxTime (p->GetSize ()));

221

  Time txTime = m_bps.CalculateBytesTxTime (p->GetSize ());

222

  Time txCompleteTime = txTime + m_tInterframeGap;

222

  Time txCompleteTime = txTime + m_tInterframeGap;

223

224

  NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << txCompleteTime.GetSeconds () << "sec");

224

  NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << txCompleteTime.GetSeconds () << "sec");

(-)a/src/spectrum/model/half-duplex-ideal-phy.cc (-3 / +3 lines)

Lines 282-289	Link Here

282

        m_txPacket = p;

282

        m_txPacket = p;

283

        ChangeState (TX);

283

        ChangeState (TX);

284

        Ptr<HalfDuplexIdealPhySignalParameters> txParams = Create<HalfDuplexIdealPhySignalParameters> ();

284

        Ptr<HalfDuplexIdealPhySignalParameters> txParams = Create<HalfDuplexIdealPhySignalParameters> ();

285

        double txTimeSeconds = m_rate.CalculateTxTime (p->GetSize ());

285

        Time txTimeSeconds = m_rate.CalculateBytesTxTime (p->GetSize ());

286

        txParams->duration = Seconds (txTimeSeconds);

286

        txParams->duration = txTimeSeconds;

287

        txParams->txPhy = GetObject<SpectrumPhy> ();

287

        txParams->txPhy = GetObject<SpectrumPhy> ();

288

        txParams->txAntenna = m_antenna;

288

        txParams->txAntenna = m_antenna;

289

        txParams->psd = m_txPsd;

289

        txParams->psd = m_txPsd;

Lines 291-297	Link Here

291

292

        NS_LOG_LOGIC (this << " tx power: " << 10 * std::log10 (Integral (*(txParams->psd))) + 30 << " dBm");

292

        NS_LOG_LOGIC (this << " tx power: " << 10 * std::log10 (Integral (*(txParams->psd))) + 30 << " dBm");

293

        m_channel->StartTx (txParams);

293

        m_channel->StartTx (txParams);

294

        Simulator::Schedule (Seconds (txTimeSeconds), &HalfDuplexIdealPhy::EndTx, this);

294

        Simulator::Schedule (txTimeSeconds, &HalfDuplexIdealPhy::EndTx, this);

295

296

      break;

296

      break;

297

Return to bug 1974