Attachment #435 for bug #556

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




 *         Listener for Nav events. Forwards to DcfManager
 ***************************************************************/

class LowDcfListener : public ns3::MacLowDcfListener {
public:
  LowDcfListener (ns3::DcfManager *dcf)
    : m_dcf (dcf) {}
  virtual ~LowDcfListener () {}
  virtual void NavStart (Time duration) {
    m_dcf->NotifyNavStartNow (duration);
  }
  virtual void NavReset (Time duration) {
    m_dcf->NotifyNavResetNow (duration);
  }
  virtual void AckTimeoutStart (Time duration) {
    m_dcf->NotifyAckTimeoutStartNow (duration);
  }
  virtual void AckTimeoutReset () {
    m_dcf->NotifyAckTimeoutResetNow ();
  }
  virtual void CtsTimeoutStart (Time duration) {
    m_dcf->NotifyCtsTimeoutStartNow (duration);
  }
  virtual void CtsTimeoutReset () {
    m_dcf->NotifyCtsTimeoutResetNow ();
  }
private:
  ns3::DcfManager *m_dcf;

 ****************************************************************/

DcfManager::DcfManager ()
  : m_lastAckTimeoutEnd (MicroSeconds (0)),
    m_lastCtsTimeoutEnd (MicroSeconds (0)),
    m_lastNavStart (MicroSeconds (0)),
    m_lastNavDuration (MicroSeconds (0)),
    m_lastRxStart (MicroSeconds (0)),
    m_lastRxDuration (MicroSeconds (0)),

void 
DcfManager::SetupLowListener (Ptr<MacLow> low)
{
  m_lowListener = new LowDcfListener (this);
  low->RegisterDcfListener (m_lowListener);
}

void 

  Time retval = Max (e, f);
  return retval;
}
Time
DcfManager::MostRecent (Time a, Time b, Time c, Time d, Time e, Time f) const
{
  Time g = Max (a, b);
  Time h = Max (c, d);
  Time i = Max (e, f);
  Time k = Max (g, h);
  Time retval = Max (k, i);
  return retval;
}

bool 
DcfManager::IsBusy (void) const

    {
      DcfState *state = *i;
      if (state->IsAccessRequested () && 
          GetBackoffEndFor (state).GetTimeStep() <= Simulator::Now ().GetTimeStep ())
        {
          /**
           * This is the first dcf we find with an expired backoff and which

  Time accessGrantedStart = MostRecent (rxAccessStart, 
                                        busyAccessStart,
                                        txAccessStart, 
                                        navAccessStart,
                                        m_lastAckTimeoutEnd,
                                        m_lastCtsTimeoutEnd
                                        );
  NS_LOG_INFO ("access grant start=" << accessGrantedStart <<
               ", rx access start=" << rxAccessStart <<
               ", busy access start=" << busyAccessStart <<

      if (state->IsAccessRequested ())
        {
          Time tmp = GetBackoffEndFor (state);
          if (tmp.GetTimeStep () > Simulator::Now ().GetTimeStep ())
            {
              //NS_LOG_UNCOND("Now:"<<Simulator::Now ().GetTimeStep ());
              accessTimeoutNeeded = true;
              expectedBackoffEnd = std::min (expectedBackoffEnd, tmp);
            }

      m_lastNavDuration = duration;
    }
}
void
DcfManager::NotifyAckTimeoutStartNow (Time duration)
{
  m_lastAckTimeoutEnd = Simulator::Now () + duration;
}
void
DcfManager::NotifyAckTimeoutResetNow ()
{
  m_lastAckTimeoutEnd = Simulator::Now ();
  DoRestartAccessTimeoutIfNeeded ();
}
void
DcfManager::NotifyCtsTimeoutStartNow (Time duration)
{
  m_lastCtsTimeoutEnd = Simulator::Now () + duration;
}
void
DcfManager::NotifyCtsTimeoutResetNow ()
{
  m_lastCtsTimeoutEnd = Simulator::Now ();
  DoRestartAccessTimeoutIfNeeded ();
}
} // namespace ns3

(-)./src/devices/wifi/dcf-manager.h (-2 / +9 lines)

Lines 233-244	Link Here

233

   * Called at end of rx

233

   * Called at end of rx

234

*/

234

*/

235

  void NotifyNavStartNow (Time duration);

235

  void NotifyNavStartNow (Time duration);

236

  void NotifyAckTimeoutStartNow (Time duration);

237

  void NotifyAckTimeoutResetNow ();

238

  void NotifyCtsTimeoutStartNow (Time duration);

239

  void NotifyCtsTimeoutResetNow ();

240

  void NotifyAckTimeoutEnd (Time duration);

237

private:

241

private:

238

  void UpdateBackoff (void);

242

  void UpdateBackoff (void);

239

  Time MostRecent (Time a, Time b) const;

243

  Time MostRecent (Time a, Time b) const;

240

  Time MostRecent (Time a, Time b, Time c) const;

244

  Time MostRecent (Time a, Time b, Time c) const;

241

  Time MostRecent (Time a, Time b, Time c, Time d) const;

245

  Time MostRecent (Time a, Time b, Time c, Time d) const;

246

  Time MostRecent (Time a, Time b, Time c, Time d, Time e, Time f) const;

242

/**

247

/**

243

   * Access will never be granted to the medium _before_

248

   * Access will never be granted to the medium _before_

244

   * the time returned by this method.

249

   * the time returned by this method.

Lines 257-262	Link Here

257

  typedef std::vector<DcfState *> States;

262

  typedef std::vector<DcfState *> States;

258

263

259

  States m_states;

264

  States m_states;

265

  Time m_lastAckTimeoutEnd;

266

  Time m_lastCtsTimeoutEnd;

260

  Time m_lastNavStart;

267

  Time m_lastNavStart;

261

  Time m_lastNavDuration;

268

  Time m_lastNavDuration;

262

  Time m_lastRxStart;

269

  Time m_lastRxStart;

Lines 274-280	Link Here

274

  Time m_slotTime;

281

  Time m_slotTime;

275

  Time m_sifs;

282

  Time m_sifs;

276

  class PhyListener *m_phyListener;

283

  class PhyListener *m_phyListener;

277

  class LowNavListener *m_lowListener;

284

  class LowDcfListener *m_lowListener;

278

};

285

};

279

286

280

} // namespace ns3

287

} // namespace ns3




{}
MacLowTransmissionListener::~MacLowTransmissionListener ()
{}
MacLowDcfListener::MacLowDcfListener ()
{}
MacLowDcfListener::~MacLowDcfListener ()
{}

MacLowTransmissionParameters::MacLowTransmissionParameters ()

  m_rxCallback = callback;
}
void 
MacLow::RegisterDcfListener (MacLowDcfListener *listener)
{
  m_dcfListeners.push_back (listener);
}



      station->ReportRtsOk (rxSnr, txMode, tag.Get ());
      
      m_ctsTimeoutEvent.Cancel ();
      NotifyCtsTimeoutResetNow ();
      m_listener->GotCts (rxSnr, txMode);
      NS_ASSERT (m_sendDataEvent.IsExpired ());
      m_sendDataEvent = Simulator::Schedule (GetSifs (), 

          m_normalAckTimeoutEvent.IsRunning ()) 
        {
          m_normalAckTimeoutEvent.Cancel ();
          NotifyAckTimeoutResetNow ();
          gotAck = true;
        }
      if (m_txParams.MustWaitFastAck () &&
          m_fastAckTimeoutEvent.IsRunning ()) 
        {
          m_fastAckTimeoutEvent.Cancel ();
          NotifyAckTimeoutResetNow ();
          gotAck = true;
        }
      if (gotAck) 

void
MacLow::DoNavResetNow (Time duration)
{
  for (DcfListenersCI i = m_dcfListeners.begin (); i != m_dcfListeners.end (); i++) 
    {
      (*i)->NavReset (duration);
    }

bool
MacLow::DoNavStartNow (Time duration)
{
  for (DcfListenersCI i = m_dcfListeners.begin (); i != m_dcfListeners.end (); i++) 
    {
      (*i)->NavStart (duration);
    }

      return true;
    }
  return false;
}
void
MacLow::NotifyAckTimeoutStartNow (Time duration)
{
  for (DcfListenersCI i = m_dcfListeners.begin (); i != m_dcfListeners.end (); i++) 
    {
      (*i)->AckTimeoutStart (duration);
    }
}
void
MacLow::NotifyAckTimeoutResetNow ()
{
  for (DcfListenersCI i = m_dcfListeners.begin (); i != m_dcfListeners.end (); i++) 
    {
      (*i)->AckTimeoutReset ();
    }
}
void
MacLow::NotifyCtsTimeoutStartNow (Time duration)
{
  for (DcfListenersCI i = m_dcfListeners.begin (); i != m_dcfListeners.end (); i++) 
    {
      (*i)->CtsTimeoutStart (duration);
    }
}
void
MacLow::NotifyCtsTimeoutResetNow ()
{
  for (DcfListenersCI i = m_dcfListeners.begin (); i != m_dcfListeners.end (); i++) 
    {
      (*i)->CtsTimeoutReset ();
    }
}

void

  Time timerDelay = txDuration + GetCtsTimeout ();

  NS_ASSERT (m_ctsTimeoutEvent.IsExpired ());
  NotifyCtsTimeoutStartNow (timerDelay);
  m_ctsTimeoutEvent = Simulator::Schedule (timerDelay, &MacLow::CtsTimeout, this);

  Ptr<Packet> packet = Create<Packet> ();

    {
      Time timerDelay = txDuration + GetAckTimeout ();
      NS_ASSERT (m_normalAckTimeoutEvent.IsExpired ());
      NotifyAckTimeoutStartNow (timerDelay);
      m_normalAckTimeoutEvent = Simulator::Schedule (timerDelay, &MacLow::NormalAckTimeout, this);
    } 
  else if (m_txParams.MustWaitFastAck ()) 
    {
      Time timerDelay = txDuration + GetPifs ();
      NS_ASSERT (m_fastAckTimeoutEvent.IsExpired ());
      NotifyAckTimeoutStartNow (timerDelay);
      m_fastAckTimeoutEvent = Simulator::Schedule (timerDelay, &MacLow::FastAckTimeout, this);
    } 
  else if (m_txParams.MustWaitSuperFastAck ()) 
    {
      Time timerDelay = txDuration + GetPifs ();
      NS_ASSERT (m_superFastAckTimeoutEvent.IsExpired ());
      NotifyAckTimeoutStartNow (timerDelay);
      m_superFastAckTimeoutEvent = Simulator::Schedule (timerDelay, 
                                                        &MacLow::SuperFastAckTimeout, this);
    } 

(-)./src/devices/wifi/mac-low.h (-7 / +15 lines)

Lines 100-109	Link Here

100

 * and calls to its methods are forwards to the corresponding

100

 * and calls to its methods are forwards to the corresponding

101

 * ns3::Dcf methods.

101

 * ns3::Dcf methods.

102

*/

102

*/

103

class MacLowNavListener {

103

class MacLowDcfListener {

104

public:

104

public:

105

  MacLowNavListener ();

105

  MacLowDcfListener ();

106

  virtual ~MacLowNavListener ();

106

  virtual ~MacLowDcfListener ();

107

/**

107

/**

108

   * \param duration duration of NAV timer

108

   * \param duration duration of NAV timer

109

*/

109

*/

Lines 112-117	Link Here

112

   * \param duration duration of NAV timer

112

   * \param duration duration of NAV timer

113

*/

113

*/

114

  virtual void NavReset (Time duration) = 0;

114

  virtual void NavReset (Time duration) = 0;

115

  virtual void AckTimeoutStart (Time duration) = 0;

116

  virtual void AckTimeoutReset () = 0;

117

  virtual void CtsTimeoutStart (Time duration) = 0;

118

  virtual void CtsTimeoutReset () = 0;

115

};

119

};

116

120

117

/**

121

/**

Lines 306-312	Link Here

306

   * \param listener listen to NAV events for every incoming

310

   * \param listener listen to NAV events for every incoming

307

   *        and outgoing packet.

311

   *        and outgoing packet.

308

*/

312

*/

309

  void RegisterNavListener (MacLowNavListener *listener);

313

  void RegisterDcfListener (MacLowDcfListener *listener);

310

314

311

/**

315

/**

312

   * \param packet to send (does not include the 802.11 MAC header and checksum)

316

   * \param packet to send (does not include the 802.11 MAC header and checksum)

Lines 375-380	Link Here

375

  void DoNavResetNow (Time duration);

379

  void DoNavResetNow (Time duration);

376

  bool DoNavStartNow (Time duration);

380

  bool DoNavStartNow (Time duration);

377

  bool IsNavZero (void) const;

381

  bool IsNavZero (void) const;

382

  void NotifyAckTimeoutStartNow (Time duration);

383

  void NotifyAckTimeoutResetNow ();

384

  void NotifyCtsTimeoutStartNow (Time duration);

385

  void NotifyCtsTimeoutResetNow ();

378

  void MaybeCancelPrevious (void);

386

  void MaybeCancelPrevious (void);

379

387

380

  void NavCounterResetCtsMissed (Time rtsEndRxTime);

388

  void NavCounterResetCtsMissed (Time rtsEndRxTime);

Lines 397-405	Link Here

397

  Ptr<WifiPhy> m_phy;

405

  Ptr<WifiPhy> m_phy;

398

  Ptr<WifiRemoteStationManager> m_stationManager;

406

  Ptr<WifiRemoteStationManager> m_stationManager;

399

  MacLowRxCallback m_rxCallback;

407

  MacLowRxCallback m_rxCallback;

400

  typedef std::vector<MacLowNavListener *>::const_iterator NavListenersCI;

408

  typedef std::vector<MacLowDcfListener *>::const_iterator DcfListenersCI;

401

  typedef std::vector<MacLowNavListener *> NavListeners;

409

  typedef std::vector<MacLowDcfListener *> DcfListeners;

402

  NavListeners m_navListeners;

410

  DcfListeners m_dcfListeners;

403

411

404

  EventId m_normalAckTimeoutEvent;

412

  EventId m_normalAckTimeoutEvent;

405

  EventId m_fastAckTimeoutEvent;

413

  EventId m_fastAckTimeoutEvent;

Return to bug 556