Attachment #1016 for bug #1034

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

(-)a/src/devices/wifi/dca-txop.cc (+8 lines)

Lines 114-119	Link Here

114

  m_transmissionListener = new DcaTxop::TransmissionListener (this);

114

  m_transmissionListener = new DcaTxop::TransmissionListener (this);

115

  m_dcf = new DcaTxop::Dcf (this);

115

  m_dcf = new DcaTxop::Dcf (this);

116

  m_queue = CreateObject<WifiMacQueue> ();

116

  m_queue = CreateObject<WifiMacQueue> ();

117

  m_queue->TraceConnectWithoutContext ("PacketDrop",

118

      MakeCallback (&DcaTxop::PacketDroppedInQueue, this));

117

  m_rng = new RealRandomStream ();

119

  m_rng = new RealRandomStream ();

118

  m_txMiddle = new MacTxMiddle ();

120

  m_txMiddle = new MacTxMiddle ();

119

121

Lines 230-235	Link Here

230

232

231

233

232

void

234

void

235

DcaTxop::PacketDroppedInQueue (Ptr<const Packet> pkt) const

236

237

  NotifyTxDrop (pkt);

238

239

240

void

233

DcaTxop::RestartAccessIfNeeded (void)

241

DcaTxop::RestartAccessIfNeeded (void)

234

242

235

  NS_LOG_FUNCTION (this);

243

  NS_LOG_FUNCTION (this);

(-)a/src/devices/wifi/dca-txop.h (+1 lines)

Lines 151-156	Link Here

151

  void NextFragment (void);

151

  void NextFragment (void);

152

  Ptr<Packet> GetFragmentPacket (WifiMacHeader *hdr);

152

  Ptr<Packet> GetFragmentPacket (WifiMacHeader *hdr);

153

  virtual void DoDispose (void);

153

  virtual void DoDispose (void);

154

  void PacketDroppedInQueue (Ptr<const Packet> pkt) const;

154

155

  Dcf *m_dcf;

156

  Dcf *m_dcf;

156

  DcfManager *m_manager;

157

  DcfManager *m_manager;

(-)a/src/devices/wifi/dcf.cc (+9 lines)

Lines 19-24	Link Here

*/

*/

#include "dcf.h"

#include "dcf.h"

#include "ns3/uinteger.h"

#include "ns3/uinteger.h"

#include "ns3/trace-source-accessor.h"

namespace ns3 {

namespace ns3 {

Lines 44-51	Link Here

                   MakeUintegerAccessor (&Dcf::SetAifsn,

                   MakeUintegerAccessor (&Dcf::SetAifsn,

                                         &Dcf::GetAifsn),

                                         &Dcf::GetAifsn),

                   MakeUintegerChecker<uint32_t> ())

                   MakeUintegerChecker<uint32_t> ())

    .AddTraceSource ("DcfDrop", "When a packet is dropped by the DCF process",

                   MakeTraceSourceAccessor (&Dcf::m_packetDropTrace))

  return tid;

  return tid;

void

Dcf::NotifyTxDrop (Ptr<const Packet> pkt) const

  m_packetDropTrace (pkt);

} // namespace ns3

} // namespace ns3

(-)a/src/devices/wifi/dcf.h (+8 lines)

Lines 22-27	Link Here

#define DCF_H

#define DCF_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ns3/traced-callback.h"

#include "ns3/packet.h"

namespace ns3 {

namespace ns3 {

Lines 36-41	Link Here

  virtual uint32_t GetMinCw (void) const = 0;

  virtual uint32_t GetMinCw (void) const = 0;

  virtual uint32_t GetMaxCw (void) const = 0;

  virtual uint32_t GetMaxCw (void) const = 0;

  virtual uint32_t GetAifsn (void) const = 0;

  virtual uint32_t GetAifsn (void) const = 0;

 protected:

  void NotifyTxDrop (Ptr<const Packet> pkt) const;

 private:

  TracedCallback<Ptr<const Packet> > m_packetDropTrace;

};

};

} // namespace ns3

} // namespace ns3

(-)a/src/devices/wifi/regular-wifi-mac.cc (+8 lines)

Lines 59-64	Link Here

  m_dca->SetManager (m_dcfManager);

  m_dca->SetManager (m_dcfManager);

  m_dca->SetTxOkCallback (MakeCallback (&RegularWifiMac::TxOk, this));

  m_dca->SetTxOkCallback (MakeCallback (&RegularWifiMac::TxOk, this));

  m_dca->SetTxFailedCallback (MakeCallback (&RegularWifiMac::TxFailed, this));

  m_dca->SetTxFailedCallback (MakeCallback (&RegularWifiMac::TxFailed, this));

  m_dca->TraceConnectWithoutContext ("DcfDrop",

      MakeCallback (&RegularWifiMac::PacketDroppedInDcf, this));

  // Construct the EDCAFs. The ordering is important - highest

  // Construct the EDCAFs. The ordering is important - highest

  // priority (see Table 9-1 in IEEE 802.11-2007) must be created

  // priority (see Table 9-1 in IEEE 802.11-2007) must be created

Lines 689-692	Link Here

689

  m_txErrCallback (hdr);

691

  m_txErrCallback (hdr);

690

692

691

693

694

void

695

RegularWifiMac::PacketDroppedInDcf (Ptr<const Packet> pkt)

696

697

  NotifyTxDrop (pkt);

698

699

692

} // namespace ns3

700

} // namespace ns3

(-)a/src/devices/wifi/regular-wifi-mac.h (+3 lines)

Lines 333-338	Link Here

333

  /** Accessor for the AC_BK channel access function */

333

  /** Accessor for the AC_BK channel access function */

334

  Ptr<EdcaTxopN> GetBKQueue (void) const;

334

  Ptr<EdcaTxopN> GetBKQueue (void) const;

335

336

  /** Listens to DcfDrop trace and forwards up */

337

  void PacketDroppedInDcf (Ptr<const Packet> pkt);

338

336

  TracedCallback<const WifiMacHeader &> m_txOkCallback;

339

  TracedCallback<const WifiMacHeader &> m_txOkCallback;

337

  TracedCallback<const WifiMacHeader &> m_txErrCallback;

340

  TracedCallback<const WifiMacHeader &> m_txErrCallback;

338

};

341

};

(-)a/src/devices/wifi/wifi-mac-queue.cc (+11 lines)

Lines 22-27	Link Here

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/uinteger.h"

#include "ns3/uinteger.h"

#include "ns3/trace-source-accessor.h"

#include "wifi-mac-queue.h"

#include "wifi-mac-queue.h"

#include "qos-blocked-destinations.h"

#include "qos-blocked-destinations.h"

Lines 52-57	Link Here

                   TimeValue (Seconds (10.0)),

                   TimeValue (Seconds (10.0)),

                   MakeTimeAccessor (&WifiMacQueue::m_maxDelay),

                   MakeTimeAccessor (&WifiMacQueue::m_maxDelay),

                   MakeTimeChecker ())

                   MakeTimeChecker ())

    .AddTraceSource ("PacketDrop", "Triggered whenever a packet was drop from queue due to MaxPacketNumber/MaxDelay constraints.",

                   MakeTraceSourceAccessor (&WifiMacQueue::m_packetDropTrace))

  return tid;

  return tid;

Lines 95-100	Link Here

  Cleanup ();

  Cleanup ();

  if (m_size == m_maxSize)

  if (m_size == m_maxSize)

100

101

      NotifyQueueDrop (packet);

      return;

102

      return;

103

100

  Time now = Simulator::Now ();

104

  Time now = Simulator::Now ();

Lines 120-125	Link Here

120

124

121

      else

125

      else

122

126

127

          NotifyQueueDrop (i->packet);

123

          i = m_queue.erase (i);

128

          i = m_queue.erase (i);

124

          n++;

129

          n++;

125

130

Lines 247-252	Link Here

247

  return 0;

252

  return 0;

248

253

249

254

255

void

256

WifiMacQueue::NotifyQueueDrop (Ptr<const Packet> pkt) const

257

258

  m_packetDropTrace (pkt);

259

260

250

bool

261

bool

251

WifiMacQueue::Remove (Ptr<const Packet> packet)

262

WifiMacQueue::Remove (Ptr<const Packet> packet)

252

263




#include "ns3/packet.h"
#include "ns3/nstime.h"
#include "ns3/object.h"
#include "ns3/traced-callback.h"
#include "wifi-mac-header.h"

namespace ns3 {

  typedef std::list<struct Item> PacketQueue;
  typedef std::list<struct Item>::reverse_iterator PacketQueueRI;
  typedef std::list<struct Item>::iterator PacketQueueI;

  /**
   * The trace source fired when a packet is dropped at the queue due to queue
   * full or when the packet has been in the queue too long.
   *
   * \see class CallBackTraceSource
   */
  TracedCallback<Ptr<const Packet> > m_packetDropTrace;
  
  void Cleanup (void);
  Mac48Address GetAddressForPacket (enum WifiMacHeader::AddressType type, PacketQueueI);
  void NotifyQueueDrop (Ptr<const Packet>) const;
  
  struct Item {
    Item (Ptr<const Packet> packet, 

Return to bug 1034