Minor fixes to the prerelease of v0.5

wigig-tools · Mar 18, 2021 · 154f975 · 154f975
1 parent 61b2614
commit 154f975
Show file tree

Hide file tree

Showing 11 changed files with 245 additions and 266 deletions.
diff --git a/src/wifi/model/cbtraa-dmg-wifi-manager.cc b/src/wifi/model/cbtraa-dmg-wifi-manager.cc
@@ -152,16 +152,16 @@ CbtraaDmgWifiManager::DoReportRtsOk (WifiRemoteStation *st,
 
 void
 CbtraaDmgWifiManager::DoReportDataOk (WifiRemoteStation *st, double ackSnr, WifiMode ackMode,
- double dataSnr, uint16_t dataChannelWidth, uint8_t)
+ double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss)
 {
- NS_LOG_FUNCTION (this << st << ackSnr << ackMode.GetUniqueName () << dataSnr << dataChannelWidth);
+ NS_LOG_FUNCTION (this << st << ackSnr << ackMode.GetUniqueName () << dataSnr << dataChannelWidth << +dataNss);
 }
 
 void
 CbtraaDmgWifiManager::DoReportAmpduTxStatus (WifiRemoteStation *st, uint8_t nSuccessfulMpdus,
- uint8_t nFailedMpdus, double rxSnr, double dataSnr)
+ uint8_t nFailedMpdus, double rxSnr, double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss)
 {
- NS_LOG_FUNCTION (this << st << +nSuccessfulMpdus << +nFailedMpdus << rxSnr << dataSnr);
+ NS_LOG_FUNCTION (this << st << +nSuccessfulMpdus << +nFailedMpdus << rxSnr << dataSnr << dataChannelWidth << +dataNss);
 }
 
 void

diff --git a/src/wifi/model/cbtraa-dmg-wifi-manager.h b/src/wifi/model/cbtraa-dmg-wifi-manager.h
@@ -57,7 +57,7 @@ class CbtraaDmgWifiManager : public WifiRemoteStationManager
  double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
  void DoReportAmpduTxStatus (WifiRemoteStation *station,
  uint8_t nSuccessfulMpdus, uint8_t nFailedMpdus,
- double rxSnr, double dataSnr);
+ double rxSnr, double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
  void DoReportFinalRtsFailed (WifiRemoteStation *station);
  void DoReportFinalDataFailed (WifiRemoteStation *station);
  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

diff --git a/src/wifi/model/codebook.cc b/src/wifi/model/codebook.cc
@@ -1256,8 +1256,8 @@ Codebook::GetSMBT_Subfields (Mac48Address from, std::vector<AntennaID> antennaCa
  }
  m_mimoCombinations.push_back (newCombination);
  // Set the list of sectors that we want to train for each antenna
- SetBeamformingSectorList (ReceiveSectorSweep, from, rxSectorCandidates);
  SetBeamformingSectorList (TransmitSectorSweep, from, txSectorCandidates);
+ SetBeamformingSectorList (ReceiveSectorSweep, from, rxSectorCandidates);
  // Count the number of subfields that we want to train
  uint16_t numberOfSubfields = CountMimoNumberOfSectors (rxSectorCandidates, m_useAWVsMimoBft);
  return numberOfSubfields;
@@ -1505,4 +1505,10 @@ Codebook::GetTotalNumberOfReceiveSectorsOrAWVs (void)
  return CountMimoNumberOfSectors (m_rxBeamformingSectors, m_useAWVsMimoBft);
 }
 
+Antenna2SectorList
+Codebook::GetRxSectorsList (void)
+{
+ return m_rxBeamformingSectors;
+}
+
 }
diff --git a/src/wifi/model/codebook.h b/src/wifi/model/codebook.h
@@ -651,6 +651,11 @@ class Codebook : public Object
  * \param useAwvs
  */
  void SetUseAWVsMimoBft (bool useAwvs);
+ /**
+ * Returns the list of the general receive sectors of the antenna.
+ * \return the list of general receive sectors
+ */
+ Antenna2SectorList GetRxSectorsList (void);
  //// NINA ////
 
 private:

diff --git a/src/wifi/model/constant-wifi-ack-policy-selector.cc b/src/wifi/model/constant-wifi-ack-policy-selector.cc
@@ -96,15 +96,25 @@ ConstantWifiAckPolicySelector::GetTemporaryParams (Ptr<WifiPsdu> psdu, MacLowTra
  }
 
  // Worst case scenario we have to send a BlockAckRequest followed by a BlockAck.
- if (m_qosTxop->GetBaBufferSize (receiver, tid) > 64)
+ //// WIGIG ////
+ if (m_qosTxop->IsEdmgSupported ())
  {
- NS_LOG_DEBUG ("Might need an Extended Compressed block ack request");
- tempParams.EnableBlockAckRequest (BlockAckType::EXTENDED_COMPRESSED_BLOCK_ACK);
+ NS_LOG_DEBUG ("Implicitly requesting an EDMG Compressed block ack");
+ params.EnableBlockAck (BlockAckType::EDMG_COMPRESSED_BLOCK_ACK);
  }
  else
+ //// WIGIG ////
  {
- NS_LOG_DEBUG ("Might need a Compressed block ack request");
- tempParams.EnableBlockAckRequest (BlockAckType::COMPRESSED_BLOCK_ACK);
+ if (m_qosTxop->GetBaBufferSize (receiver, tid) > 64)
+ {
+ NS_LOG_DEBUG ("Might need an Extended Compressed block ack request");
+ tempParams.EnableBlockAckRequest (BlockAckType::EXTENDED_COMPRESSED_BLOCK_ACK);
+ }
+ else
+ {
+ NS_LOG_DEBUG ("Might need a Compressed block ack request");
+ tempParams.EnableBlockAckRequest (BlockAckType::COMPRESSED_BLOCK_ACK);
+ }
  }
  return tempParams;
 }
@@ -193,6 +203,28 @@ ConstantWifiAckPolicySelector::UpdateTxParams (Ptr<WifiPsdu> psdu, MacLowTransmi
  {
  NS_LOG_DEBUG ("Scheduling a Compressed block ack request");
  params.EnableBlockAckRequest (BlockAckType::COMPRESSED_BLOCK_ACK);
+ }//// WIGIG ////
+ if (m_qosTxop->IsEdmgSupported ())
+ {
+ NS_LOG_DEBUG ("Implicitly requesting an EDMG Compressed block ack");
+ params.EnableBlockAck (BlockAckType::EDMG_COMPRESSED_BLOCK_ACK);
+ }
+ else
+ //// WIGIG ////
+ {
+ // in case of single MPDU, there are previous unacknowledged frames, thus
+ // we cannot use Implicit Block Ack Request policy, otherwise we get a
+ // normal ack as response
+ if (m_qosTxop->GetBaBufferSize (receiver, tid) > 64)
+ {
+ NS_LOG_DEBUG ("Scheduling an Extended Compressed block ack request");
+ params.EnableBlockAckRequest (BlockAckType::EXTENDED_COMPRESSED_BLOCK_ACK);
+ }
+ else
+ {
+ NS_LOG_DEBUG ("Scheduling a Compressed block ack request");
+ params.EnableBlockAckRequest (BlockAckType::COMPRESSED_BLOCK_ACK);
+ }
  }
  return;
  }