ns-3.24: comparison src/devices/wifi/dca-txop.cc

equal deleted inserted replaced

-:1bae76be026d
+:20f882e85b4a
 DcaTxop *m_txop;
 };
 DcaTxop::DcaTxop (uint32_t minCw, uint32_t maxCw, uint32_t aifsn, DcfManager *manager)
 : m_manager (manager),
-m_hasCurrent (false),
+m_currentPacket (0),
 m_ssrc (0),
 m_slrc (0)
 {
 m_transmissionListener = new DcaTxop::TransmissionListener (this);
 {
 m_queue->SetMaxDelay (delay);
 }
 void
-DcaTxop::Queue (Packet packet, WifiMacHeader const &hdr)
+DcaTxop::Queue (Ptr<const Packet> packet, WifiMacHeader const &hdr)
 {
 m_queue->Enqueue (packet, hdr);
 StartAccessIfNeeded ();
 }
 void
 DcaTxop::RestartAccessIfNeeded (void)
 {
-if ((m_hasCurrent ||
+if ((m_currentPacket != 0 ||
 !m_queue->IsEmpty ()) &&
 !m_dcf->IsAccessRequested ())
 {
 m_manager->RequestAccess (m_dcf);
 }
 }
 void
 DcaTxop::StartAccessIfNeeded (void)
 {
-if (!m_hasCurrent &&
+if (m_currentPacket == 0 &&
 !m_queue->IsEmpty () &&
 !m_dcf->IsAccessRequested ())
 {
 m_manager->RequestAccess (m_dcf);
 }
 bool
 DcaTxop::NeedRts (void)
 {
-if (m_currentPacket.GetSize () > Parameters ()->GetRtsCtsThreshold ())
+if (m_currentPacket->GetSize () > Parameters ()->GetRtsCtsThreshold ())
 {
 return true;
 }
 else
 {
 }
 bool
 DcaTxop::NeedFragmentation (void)
 {
-if (m_currentPacket.GetSize () > Parameters ()->GetFragmentationThreshold ())
+if (m_currentPacket->GetSize () > Parameters ()->GetFragmentationThreshold ())
 {
 return true;
 }
 else
 {
 }
 uint32_t
 DcaTxop::GetNFragments (void)
 {
-uint32_t nFragments = m_currentPacket.GetSize () / Parameters ()->GetFragmentationThreshold () + 1;
+uint32_t nFragments = m_currentPacket->GetSize () / Parameters ()->GetFragmentationThreshold () + 1;
 return nFragments;
 }
 void
 DcaTxop::NextFragment (void)
 {
 }
 uint32_t
 DcaTxop::GetLastFragmentSize (void)
 {
-uint32_t lastFragmentSize = m_currentPacket.GetSize () %
+uint32_t lastFragmentSize = m_currentPacket->GetSize () %
 Parameters ()->GetFragmentationThreshold ();
 return lastFragmentSize;
 }
 uint32_t
 {
 return GetFragmentSize ();
 }
 }
-Packet
+Ptr<Packet>
 DcaTxop::GetFragmentPacket (WifiMacHeader *hdr)
 {
 *hdr = m_currentHdr;
 hdr->SetFragmentNumber (m_fragmentNumber);
 uint32_t startOffset = m_fragmentNumber * GetFragmentSize ();
-Packet fragment;
+Ptr<Packet> fragment;
 if (IsLastFragment ())
 {
 hdr->SetNoMoreFragments ();
-fragment = m_currentPacket.CreateFragment (startOffset,
+fragment = m_currentPacket->CreateFragment (startOffset,
 GetLastFragmentSize ());
 }
 else
 {
 hdr->SetMoreFragments ();
-fragment = m_currentPacket.CreateFragment (startOffset,
+fragment = m_currentPacket->CreateFragment (startOffset,
 GetFragmentSize ());
 }
 return fragment;
 }
 bool
 DcaTxop::NeedsAccess (void) const
 {
-return !m_queue->IsEmpty () || m_hasCurrent;
+return !m_queue->IsEmpty () || m_currentPacket != 0;
 }
 void
 DcaTxop::NotifyAccessGranted (void)
 {
-if (!m_hasCurrent)
+if (m_currentPacket == 0)
 {
 if (m_queue->IsEmpty ())
 {
 MY_DEBUG ("queue empty");
 return;
 }
-bool found;
+m_currentPacket = m_queue->Dequeue (&m_currentHdr);
-m_currentPacket = m_queue->Dequeue (&m_currentHdr, &found);
+NS_ASSERT (m_currentPacket != 0);
-NS_ASSERT (found);
-m_hasCurrent = true;
-NS_ASSERT (m_hasCurrent);
 uint16_t sequence = m_txMiddle->GetNextSequenceNumberfor (&m_currentHdr);
 m_currentHdr.SetSequenceNumber (sequence);
 m_currentHdr.SetFragmentNumber (0);
 m_currentHdr.SetNoMoreFragments ();
 m_ssrc = 0;
 m_slrc = 0;
 m_fragmentNumber = 0;
-MY_DEBUG ("dequeued size="<<m_currentPacket.GetSize ()<<
+MY_DEBUG ("dequeued size="<<m_currentPacket->GetSize ()<<
 ", to="<<m_currentHdr.GetAddr1 ()<<
 ", seq="<<m_currentHdr.GetSequenceControl ());
 }
 MacLowTransmissionParameters params;
 params.DisableOverrideDurationId ();
 params.DisableNextData ();
 Low ()->StartTransmission (m_currentPacket,
 &m_currentHdr,
 params,
 m_transmissionListener);
-m_hasCurrent = false;
+m_currentPacket = 0;
 m_dcf->ResetCw ();
 m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
 MY_DEBUG ("tx broadcast");
 }
 else
 if (NeedFragmentation ())
 {
 params.DisableRts ();
 WifiMacHeader hdr;
-Packet fragment = GetFragmentPacket (&hdr);
+Ptr<Packet> fragment = GetFragmentPacket (&hdr);
 if (IsLastFragment ())
 {
-MY_DEBUG ("fragmenting last fragment size="<<fragment.GetSize ());
+MY_DEBUG ("fragmenting last fragment size="<<fragment->GetSize ());
 params.DisableNextData ();
 }
 else
 {
-MY_DEBUG ("fragmenting size="<<fragment.GetSize ());
+MY_DEBUG ("fragmenting size="<<fragment->GetSize ());
 params.EnableNextData (GetNextFragmentSize ());
 }
 Low ()->StartTransmission (fragment, &hdr, params,
 m_transmissionListener);
 }
 {
 params.DisableRts ();
 MY_DEBUG ("tx unicast");
 }
 params.DisableNextData ();
-// We need to make a copy in case we need to
+Low ()->StartTransmission (m_currentPacket, &m_currentHdr,
-// retransmit the packet: the MacLow modifies the input
-// Packet so, we would retransmit a modified packet
-// if we were not to make a copy.
-// XXX the comment above and the code below do not
-// make sense anymore. So, we should remove both.
-Packet copy = m_currentPacket;
-Low ()->StartTransmission (copy, &m_currentHdr,
 params, m_transmissionListener);
 }
 }
 }
 m_ssrc++;
 m_ctstimeoutTrace (m_ssrc);
 if (m_ssrc > Parameters ()->GetMaxSsrc ())
 {
 // to reset the dcf.
-m_hasCurrent = false;
+m_currentPacket = 0;
 m_dcf->ResetCw ();
 }
 else
 {
 m_dcf->UpdateFailedCw ();
 }
 /* we are not fragmenting or we are done fragmenting
 * so we can get rid of that packet now.
 */
-m_hasCurrent = false;
+m_currentPacket = 0;
 m_dcf->ResetCw ();
 m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
 RestartAccessIfNeeded ();
 }
 else
 {
-MY_DEBUG ("got ack. tx not done, size="<<m_currentPacket.GetSize ());
+MY_DEBUG ("got ack. tx not done, size="<<m_currentPacket->GetSize ());
 }
 }
 void
 DcaTxop::MissedAck (void)
 {
 m_slrc++;
 m_acktimeoutTrace (m_slrc);
 if (m_slrc > Parameters ()->GetMaxSlrc ())
 {
 // to reset the dcf.
-m_hasCurrent = false;
+m_currentPacket = 0;
 m_dcf->ResetCw ();
 }
 else
 {
 m_currentHdr.SetRetry ();
 {
 MY_DEBUG ("start next packet fragment");
 /* this callback is used only for fragments. */
 NextFragment ();
 WifiMacHeader hdr;
-Packet fragment = GetFragmentPacket (&hdr);
+Ptr<Packet> fragment = GetFragmentPacket (&hdr);
 MacLowTransmissionParameters params;
 params.EnableAck ();
 params.DisableRts ();
 params.DisableOverrideDurationId ();
 if (IsLastFragment ())

changeset 2159	20f882e85b4a
parent 2146	40ad60ac9912
child 2161	f5086fb78018