Attachment #3175 for bug #2986

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

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

Lines 57-62	Link Here

</ul>

</ul>

<h2>Changes to existing API:</h2>

<h2>Changes to existing API:</h2>

<ul>

<ul>

<li> The trace sources BackoffTrace and CwTrace were moved from class QosTxop to base class Txop, allowing these values to be traced for DCF operation.  In addition, the trace signature for BackoffTrace was changed from TracedValue to TracedCallback (callback taking one argument instead of two).  Most users of CwTrace for QosTxop configurations will not need to change existing programs, but users of BackoffTrace will need to adjust the callback signature to match.</li>

</ul>

</ul>

<h2>Changes to build system:</h2>

<h2>Changes to build system:</h2>

<ul>

<ul>




    .SetParent<ns3::Txop> ()
    .SetGroupName ("Wifi")
    .AddConstructor<QosTxop> ()
    .AddTraceSource ("BackoffTrace",
                     "Trace source for backoff values",
                     MakeTraceSourceAccessor (&QosTxop::m_backoffTrace),
                     "ns3::TracedValueCallback::Uint32")
    .AddTraceSource ("CwTrace",
                     "Trace source for contention window values",
                     MakeTraceSourceAccessor (&QosTxop::m_cwTrace),
                     "ns3::TracedValueCallback::Uint32")
    .AddTraceSource ("TxopTrace",
                     "Trace source for txop start and duration times",
                     MakeTraceSourceAccessor (&QosTxop::m_txopTrace),

          UpdateFailedCw ();
        }
    }
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
  RestartAccessIfNeeded ();
}


QosTxop::NotifyCollision (void)
{
  NS_LOG_FUNCTION (this);
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
  RestartAccessIfNeeded ();
}


      UpdateFailedCw ();
      m_cwTrace = GetCw ();
    }
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
  RestartAccessIfNeeded ();
}


              m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
            }
          m_cwTrace = GetCw ();
          m_backoff = m_rng->GetInteger (0, GetCw ());
          m_backoffTrace (m_backoff);
          StartBackoffNow (m_backoff);
          RestartAccessIfNeeded ();
        }
    }

            {
              m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
              m_cwTrace = GetCw ();
              m_backoff = m_rng->GetInteger (0, GetCw ());
              m_backoffTrace (m_backoff);
              StartBackoffNow (m_backoff);
              m_fragmentNumber++;
              RestartAccessIfNeeded ();
            }

      UpdateFailedCw ();
      m_cwTrace = GetCw ();
    }
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
  RestartAccessIfNeeded ();
}


      ResetCw ();
      m_cwTrace = GetCw ();
    }
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
  RestartAccessIfNeeded ();
}


  m_currentPacket = 0;
  ResetCw ();
  m_cwTrace = GetCw ();
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
  StartAccessIfNeeded ();
}


          m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
        }
      m_cwTrace = GetCw ();
      m_backoff = m_rng->GetInteger (0, GetCw ());
      m_backoffTrace (m_backoff);
      StartBackoffNow (m_backoff);
      RestartAccessIfNeeded ();
    }
}

  NS_LOG_FUNCTION (this);
  ResetCw ();
  m_cwTrace = GetCw ();
  m_backoff = m_rng->GetInteger (0, GetCw ());
  m_backoffTrace (m_backoff);
  StartBackoffNow (m_backoff);
}

void

(-)a/src/wifi/model/qos-txop.h (-2 lines)

Lines 552-559	Link Here

552

  bool m_isAccessRequestedForRts;                   //!< flag whether access is requested to transmit a RTS frame

552

  bool m_isAccessRequestedForRts;                   //!< flag whether access is requested to transmit a RTS frame

553

  bool m_currentIsFragmented;                       //!< flag whether current packet is fragmented

553

  bool m_currentIsFragmented;                       //!< flag whether current packet is fragmented

554

555

  TracedValue<uint32_t> m_backoffTrace;   //!< backoff trace value

556

  TracedValue<uint32_t> m_cwTrace;        //!< CW trace value

557

  TracedCallback<Time, Time> m_txopTrace; //!< TXOP trace callback

555

  TracedCallback<Time, Time> m_txopTrace; //!< TXOP trace callback

558

};

556

};

559

557

(-)a/src/wifi/model/txop.cc (-6 / +36 lines)

Lines 69-74	Link Here

                   PointerValue (),

                   PointerValue (),

                   MakePointerAccessor (&Txop::GetWifiMacQueue),

                   MakePointerAccessor (&Txop::GetWifiMacQueue),

                   MakePointerChecker<WifiMacQueue> ())

                   MakePointerChecker<WifiMacQueue> ())

    .AddTraceSource ("BackoffTrace",

                     "Trace source for backoff values",

                     MakeTraceSourceAccessor (&Txop::m_backoffTrace),

                     "ns3::TracedCallback::Uint32Callback")

    .AddTraceSource ("CwTrace",

                     "Trace source for contention window values",

                     MakeTraceSourceAccessor (&Txop::m_cwTrace),

                     "ns3::TracedValueCallback::Uint32")

  return tid;

  return tid;

Lines 78-83	Link Here

    m_cwMin (0),

    m_cwMin (0),

    m_cwMax (0),

    m_cwMax (0),

    m_cw (0),

    m_cw (0),

    m_backoff (0),

    m_accessRequested (false),

    m_accessRequested (false),

    m_backoffSlots (0),

    m_backoffSlots (0),

    m_backoffStart (Seconds (0.0)),

    m_backoffStart (Seconds (0.0)),

Lines 180-185	Link Here

180

  if (changed == true)

189

  if (changed == true)

181

190

182

      ResetCw ();

191

      ResetCw ();

192

      m_cwTrace = GetCw ();

183

193

184

194

185

195

Lines 192-197	Link Here

192

  if (changed == true)

202

  if (changed == true)

193

203

194

      ResetCw ();

204

      ResetCw ();

205

      m_cwTrace = GetCw ();

195

206

196

207

197

208

Lines 346-352	Link Here

346

357

347

  NS_LOG_FUNCTION (this);

358

  NS_LOG_FUNCTION (this);

348

  ResetCw ();

359

  ResetCw ();

349

  StartBackoffNow (m_rng->GetInteger (0, GetCw ()));

360

  m_cwTrace = GetCw ();

361

  m_backoff = m_rng->GetInteger (0, GetCw ());

362

  m_backoffTrace (m_backoff);

363

  StartBackoffNow (m_backoff);

350

364

351

365

352

bool

366

bool

Lines 519-525	Link Here

519

Txop::NotifyCollision (void)

533

Txop::NotifyCollision (void)

520

534

521

  NS_LOG_FUNCTION (this);

535

  NS_LOG_FUNCTION (this);

522

  StartBackoffNow (m_rng->GetInteger (0, GetCw ()));

536

  m_backoff = m_rng->GetInteger (0, GetCw ());

537

  m_backoffTrace (m_backoff);

538

  StartBackoffNow (m_backoff);

523

  RestartAccessIfNeeded ();

539

  RestartAccessIfNeeded ();

524

540

525

541

Lines 580-591	Link Here

580

      //to reset the dcf.

596

      //to reset the dcf.

581

      m_currentPacket = 0;

597

      m_currentPacket = 0;

582

      ResetCw ();

598

      ResetCw ();

599

      m_cwTrace = GetCw ();

583

600

584

  else

601

  else

585

602

586

      UpdateFailedCw ();

603

      UpdateFailedCw ();

604

      m_cwTrace = GetCw ();

587

605

588

  StartBackoffNow (m_rng->GetInteger (0, GetCw ()));

606

  m_backoff = m_rng->GetInteger (0, GetCw ());

607

  m_backoffTrace (m_backoff);

608

  StartBackoffNow (m_backoff);

589

  RestartAccessIfNeeded ();

609

  RestartAccessIfNeeded ();

590

610

591

611

Lines 607-613	Link Here

607

*/

627

*/

608

      m_currentPacket = 0;

628

      m_currentPacket = 0;

609

      ResetCw ();

629

      ResetCw ();

610

      StartBackoffNow (m_rng->GetInteger (0, GetCw ()));

630

      m_cwTrace = GetCw ();

631

      m_backoff = m_rng->GetInteger (0, GetCw ());

632

      m_backoffTrace (m_backoff);

633

      StartBackoffNow (m_backoff);

611

      RestartAccessIfNeeded ();

634

      RestartAccessIfNeeded ();

612

635

613

  else

636

  else

Lines 633-646	Link Here

633

      //to reset the dcf.

656

      //to reset the dcf.

634

      m_currentPacket = 0;

657

      m_currentPacket = 0;

635

      ResetCw ();

658

      ResetCw ();

659

      m_cwTrace = GetCw ();

636

660

637

  else

661

  else

638

662

639

      NS_LOG_DEBUG ("Retransmit");

663

      NS_LOG_DEBUG ("Retransmit");

640

      m_currentHdr.SetRetry ();

664

      m_currentHdr.SetRetry ();

641

      UpdateFailedCw ();

665

      UpdateFailedCw ();

666

      m_cwTrace = GetCw ();

642

667

643

  StartBackoffNow (m_rng->GetInteger (0, GetCw ()));

668

  m_backoff = m_rng->GetInteger (0, GetCw ());

669

  m_backoffTrace (m_backoff);

670

  StartBackoffNow (m_backoff);

644

  RestartAccessIfNeeded ();

671

  RestartAccessIfNeeded ();

645

672

646

673

Lines 720-726	Link Here

720

  NS_LOG_DEBUG ("a transmission that did not require an ACK just finished");

747

  NS_LOG_DEBUG ("a transmission that did not require an ACK just finished");

721

  m_currentPacket = 0;

748

  m_currentPacket = 0;

722

  ResetCw ();

749

  ResetCw ();

723

  StartBackoffNow (m_rng->GetInteger (0, GetCw ()));

750

  m_cwTrace = GetCw ();

751

  m_backoff = m_rng->GetInteger (0, GetCw ());

752

  m_backoffTrace (m_backoff);

753

  StartBackoffNow (m_backoff);

724

  if (!m_txOkCallback.IsNull ())

754

  if (!m_txOkCallback.IsNull ())

725

755

726

      m_txOkCallback (m_currentHdr);

756

      m_txOkCallback (m_currentHdr);

(-)a/src/wifi/model/txop.h (+4 lines)

Lines 21-26	Link Here

#ifndef TXOP_H

#ifndef TXOP_H

#define TXOP_H

#define TXOP_H

#include "ns3/traced-value.h"

#include "mac-low-transmission-parameters.h"

#include "mac-low-transmission-parameters.h"

#include "wifi-mac-header.h"

#include "wifi-mac-header.h"

Lines 506-511	Link Here

506

  uint32_t m_cwMin;       //!< the CW minimum

507

  uint32_t m_cwMin;       //!< the CW minimum

507

  uint32_t m_cwMax;       //!< the CW maximum

508

  uint32_t m_cwMax;       //!< the CW maximum

508

  uint32_t m_cw;          //!< the current CW

509

  uint32_t m_cw;          //!< the current CW

510

  uint32_t m_backoff;     //!< the current backoff

509

  bool m_accessRequested; //!< flag whether channel access is already requested

511

  bool m_accessRequested; //!< flag whether channel access is already requested

510

  uint32_t m_backoffSlots; //!< the backoff slots

512

  uint32_t m_backoffSlots; //!< the backoff slots

511

/**

513

/**

Lines 522-527	Link Here

522

  WifiMacHeader m_currentHdr; //!< the current header

524

  WifiMacHeader m_currentHdr; //!< the current header

523

  MacLowTransmissionParameters m_currentParams; ///< current transmission parameters

525

  MacLowTransmissionParameters m_currentParams; ///< current transmission parameters

524

  uint8_t m_fragmentNumber; //!< the fragment number

526

  uint8_t m_fragmentNumber; //!< the fragment number

527

  TracedCallback<uint32_t> m_backoffTrace;   //!< backoff trace value

528

  TracedValue<uint32_t> m_cwTrace;        //!< CW trace value

525

};

529

};

526

530

527

} //namespace ns3

531

} //namespace ns3

Return to bug 2986