Attachment #2279 for bug #1205

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

(-)a/src/wifi/model/dca-txop.cc (-1 / +4 lines)

Lines 48-54	Link Here

    : m_txop (txop)

    : m_txop (txop)

  virtual bool IsEdca (void) const

    return false;

private:

private:

  virtual void DoNotifyAccessGranted (void)

  virtual void DoNotifyAccessGranted (void)




        {
          uint32_t nus = (Simulator::Now () - backoffStart).GetMicroSeconds ();
          uint32_t nIntSlots = nus / m_slotTimeUs;
          /*
           * EDCA behaves slightly different to DCA. For EDCA we
           * decrement once at the slot boundary at the end of AIFS as
           * well as once at the end of each clear slot
           * thereafter. For DCA we only decrement at the end of each
           * clear slot after DIFS. We account for the extra backoff
           * by incrementing the slot count here in the case of
           * EDCA. The if statement whose body we are in has confirmed
           * that a minimum of AIFS has elapsed since last busy
           * medium.
           */
          if (state->IsEdca ())
            {
              nIntSlots++;
            }
          uint32_t n = std::min (nIntSlots, state->GetBackoffSlots ());
          MY_DEBUG ("dcf " << k << " dec backoff slots=" << n);
          Time backoffUpdateBound = backoffStart + MicroSeconds (n * m_slotTimeUs);




  virtual ~DcfState ();

  /**
   * \return whether this DCF state is an EDCA state
   *
   * This method, which must be overridden in derived classes,
   * indicates whether DCF or EDCAF rules should be used for this
   * channel access function. This affects the behavior of DcfManager
   * when dealing with this instance. 
   */
  virtual bool IsEdca (void) const = 0;

  /**
   * \param aifsn the number of slots which make up an AIFS for a specific DCF.
   *        a DIFS corresponds to an AIFSN = 2.
   *

(-)a/src/wifi/model/edca-txop-n.cc (+5 lines)

Lines 51-56	Link Here

  virtual bool IsEdca (void) const

    return true;

private:

private:

  virtual void DoNotifyAccessGranted (void)

  virtual void DoNotifyAccessGranted (void)

(-)a/src/wifi/test/dcf-manager-test.cc (+7 lines)

Lines 31-36	Link Here

public:

public:

  DcfStateTest (DcfManagerTest *test, uint32_t i);

  DcfStateTest (DcfManagerTest *test, uint32_t i);

  void QueueTx (uint64_t txTime, uint64_t expectedGrantTime);

  void QueueTx (uint64_t txTime, uint64_t expectedGrantTime);

  bool IsEdca (void) const;

private:

private:

Lines 113-118	Link Here

113

114

115

116

117

bool

118

DcfStateTest::IsEdca (void) const

119

120

  return false;

121

122

116

void

123

void

117

DcfStateTest::QueueTx (uint64_t txTime, uint64_t expectedGrantTime)

124

DcfStateTest::QueueTx (uint64_t txTime, uint64_t expectedGrantTime)

118

125

Return to bug 1205