ns-3.24: comparison src/devices/wifi/mac-low.cc

equal deleted inserted replaced

-:27b183b18d4d
+:fa0747c4ad5e
 #include "wifi-mac.h"
 NS_LOG_COMPONENT_DEFINE ("MacLow");
 #define MY_DEBUG(x) \
-NS_LOG_DEBUG (Simulator::Now () << " " << m_mac->GetAddress () << " " << x)
+NS_LOG_DEBUG (m_mac->GetAddress () << " " << x)
 namespace ns3 {
 class SnrTag : public Tag
 {
 {
 NS_ASSERT (HasNextPacket ());
 return m_nextSize;
 }
+std::ostream &operator << (std::ostream &os, const MacLowTransmissionParameters &params)
+{
+os << "["
+<< "send rts=" << params.m_sendRts << ", "
+<< "next size=" << params.m_nextSize << ", "
+<< "dur=" << params.m_overrideDurationId << ", "
+<< "ack=";
+switch (params.m_waitAck) {
+case MacLowTransmissionParameters::ACK_NONE:
+os << "none";
+break;
+case MacLowTransmissionParameters::ACK_NORMAL:
+os << "normal";
+break;
+case MacLowTransmissionParameters::ACK_FAST:
+os << "fast";
+break;
+case MacLowTransmissionParameters::ACK_SUPER_FAST:
+os << "super-fast";
+break;
+}
+os << "]";
+return os;
+}
 MacLow::MacLow ()
 : m_normalAckTimeoutEvent (),
 m_fastAckTimeoutEvent (),
 m_superFastAckTimeoutEvent (),
 m_sendDataEvent (),
 m_waitSifsEvent (),
 m_currentPacket (0),
 m_listener (0)
 {
+NS_LOG_FUNCTION (this);
 m_lastNavDuration = Seconds (0);
 m_lastNavStart = Seconds (0);
 }
 MacLow::~MacLow ()
-{}
+{
+NS_LOG_FUNCTION (this);
+}
 void
 MacLow::DoDispose (void)
 {
+NS_LOG_FUNCTION (this);
 CancelAllEvents ();
 m_phy = 0;
 m_mac = 0;
 m_stationManager = 0;
 }
 void
 MacLow::CancelAllEvents (void)
 {
+NS_LOG_FUNCTION (this);
 bool oneRunning = false;
 if (m_normalAckTimeoutEvent.IsRunning ())
 {
 m_normalAckTimeoutEvent.Cancel ();
 oneRunning = true;
 void
 MacLow::StartTransmission (Ptr<const Packet> packet,
 WifiMacHeader const*hdr,
-MacLowTransmissionParameters parameters,
+MacLowTransmissionParameters params,
 MacLowTransmissionListener *listener)
 {
+NS_LOG_FUNCTION (this << packet << hdr << params << listener);
 /* m_currentPacket is not NULL because someone started
 * a transmission and was interrupted before one of:
 *   - ctsTimeout
 *   - sendDataAfterCTS
 * expired. This means that one of these timers is still
 */
 m_currentPacket = packet->Copy ();
 m_currentHdr = *hdr;
 CancelAllEvents ();
 m_listener = listener;
-m_txParams = parameters;
+m_txParams = params;
 //NS_ASSERT (m_phy->IsStateIdle ());
 MY_DEBUG ("startTx size="<< GetSize (m_currentPacket, &m_currentHdr) <<
 ", to=" << m_currentHdr.GetAddr1()<<", listener="<<m_listener);
 }
 void
 MacLow::ReceiveError (Ptr<Packet> packet, double rxSnr)
 {
+NS_LOG_FUNCTION (this << packet << rxSnr);
 MY_DEBUG ("rx failed ");
 if (m_txParams.MustWaitFastAck ())
 {
 NS_ASSERT (m_fastAckFailedTimeoutEvent.IsExpired ());
 m_fastAckFailedTimeoutEvent = Simulator::Schedule (GetSifs (),
 }
 void
 MacLow::ReceiveOk (Ptr<Packet> packet, double rxSnr, WifiMode txMode, WifiPreamble preamble)
 {
+NS_LOG_FUNCTION (this << packet << rxSnr << txMode << preamble);
 /* A packet is received from the PHY.
 * When we have handled this packet,
 * we handle any packet present in the
 * packet queue.
 */
 void
 MacLow::ForwardDown (Ptr<const Packet> packet, WifiMacHeader const* hdr,
 WifiMode txMode)
 {
+NS_LOG_FUNCTION (this << packet << hdr << txMode);
 MY_DEBUG ("send " << hdr->GetTypeString () <<
 ", to=" << hdr->GetAddr1 () <<
 ", size=" << packet->GetSize () <<
 ", mode=" << txMode <<
 ", duration=" << hdr->GetDuration () <<
 }
 void
 MacLow::CtsTimeout (void)
 {
+NS_LOG_FUNCTION (this);
 MY_DEBUG ("cts timeout");
 // XXX: should check that there was no rx start before now.
 // we should restart a new cts timeout now until the expected
 // end of rx if there was a rx start before now.
 WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
 listener->MissedCts ();
 }
 void
 MacLow::NormalAckTimeout (void)
 {
+NS_LOG_FUNCTION (this);
 MY_DEBUG ("normal ack timeout");
 // XXX: should check that there was no rx start before now.
 // we should restart a new ack timeout now until the expected
 // end of rx if there was a rx start before now.
 WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
 listener->MissedAck ();
 }
 void
 MacLow::FastAckTimeout (void)
 {
+NS_LOG_FUNCTION (this);
 WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
 station->ReportDataFailed ();
 MacLowTransmissionListener *listener = m_listener;
 m_listener = 0;
 if (m_phy->IsStateIdle ())
 }
 }
 void
 MacLow::SuperFastAckTimeout ()
 {
+NS_LOG_FUNCTION (this);
 WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
 station->ReportDataFailed ();
 MacLowTransmissionListener *listener = m_listener;
 m_listener = 0;
 if (m_phy->IsStateIdle ())
 }
 void
 MacLow::SendRtsForPacket (void)
 {
+NS_LOG_FUNCTION (this);
 /* send an RTS for this packet. */
 WifiMacHeader rts;
 rts.SetType (WIFI_MAC_CTL_RTS);
 rts.SetDsNotFrom ();
 rts.SetDsNotTo ();
 }
 void
 MacLow::SendDataPacket (void)
 {
+NS_LOG_FUNCTION (this);
 /* send this packet directly. No RTS is needed. */
 StartDataTxTimers ();
 WifiMode dataTxMode = GetDataTxMode (m_currentPacket, &m_currentHdr);
 Time duration = Seconds (0.0);
 }
 void
 MacLow::SendCtsAfterRts (Mac48Address source, Time duration, WifiMode rtsTxMode, double rtsSnr)
 {
+NS_LOG_FUNCTION (this);
 /* send a CTS when you receive a RTS
 * right after SIFS.
 */
 WifiMode ctsTxMode = GetCtsTxModeForRts (source, rtsTxMode);
 WifiMacHeader cts;
 }
 void
 MacLow::SendDataAfterCts (Mac48Address source, Time duration, WifiMode txMode)
 {
+NS_LOG_FUNCTION (this);
 /* send the third step in a
 * RTS/CTS/DATA/ACK hanshake
 */
 NS_ASSERT (m_currentPacket != 0);
 StartDataTxTimers ();
 }
 void
 MacLow::FastAckFailedTimeout (void)
 {
+NS_LOG_FUNCTION (this);
 MacLowTransmissionListener *listener = m_listener;
 m_listener = 0;
 listener->MissedAck ();
 MY_DEBUG ("fast Ack busy but missed");
 }
 void
 MacLow::SendAckAfterData (Mac48Address source, Time duration, WifiMode dataTxMode, double dataSnr)
 {
+NS_LOG_FUNCTION (this);
 /* send an ACK when you receive
 * a packet after SIFS.
 */
 WifiMode ackTxMode = GetAckTxModeForData (source, dataTxMode);
 WifiMacHeader ack;

changeset 2985	fa0747c4ad5e
parent 2793	10a571d9a9f7
child 3038	5962e2962fa9