diff --git a/src/wifi/helper/wifi-helper.cc b/src/wifi/helper/wifi-helper.cc index 800f6cdaa..90f8f191e 100644 --- a/src/wifi/helper/wifi-helper.cc +++ b/src/wifi/helper/wifi-helper.cc @@ -877,111 +877,111 @@ WifiHelper::Install(const WifiPhyHelper& phy, const WifiMacHelper& mac, std::str } void -WifiHelper::EnableLogComponents() +WifiHelper::EnableLogComponents(LogLevel logLevel) { LogComponentEnableAll(LOG_PREFIX_TIME); LogComponentEnableAll(LOG_PREFIX_NODE); - LogComponentEnable("AarfWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("AarfcdWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("AdhocWifiMac", LOG_LEVEL_ALL); - LogComponentEnable("AmrrWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("ApWifiMac", LOG_LEVEL_ALL); - LogComponentEnable("AparfWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("ArfWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("BlockAckAgreement", LOG_LEVEL_ALL); - LogComponentEnable("BlockAckManager", LOG_LEVEL_ALL); - LogComponentEnable("CaraWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("ChannelAccessManager", LOG_LEVEL_ALL); - LogComponentEnable("ConstantObssPdAlgorithm", LOG_LEVEL_ALL); - LogComponentEnable("ConstantRateWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("DefaultEmlsrManager", LOG_LEVEL_ALL); - LogComponentEnable("DsssErrorRateModel", LOG_LEVEL_ALL); - LogComponentEnable("DsssPhy", LOG_LEVEL_ALL); - LogComponentEnable("DsssPpdu", LOG_LEVEL_ALL); - LogComponentEnable("EhtFrameExchangeManager", LOG_LEVEL_ALL); - LogComponentEnable("EhtPhy", LOG_LEVEL_ALL); - LogComponentEnable("EhtPpdu", LOG_LEVEL_ALL); - LogComponentEnable("EmlsrManager", LOG_LEVEL_ALL); - LogComponentEnable("ErpOfdmPhy", LOG_LEVEL_ALL); - LogComponentEnable("ErpOfdmPpdu", LOG_LEVEL_ALL); - LogComponentEnable("FrameExchangeManager", LOG_LEVEL_ALL); - LogComponentEnable("HeConfiguration", LOG_LEVEL_ALL); - LogComponentEnable("HeFrameExchangeManager", LOG_LEVEL_ALL); - LogComponentEnable("HePhy", LOG_LEVEL_ALL); - LogComponentEnable("HePpdu", LOG_LEVEL_ALL); - LogComponentEnable("HtConfiguration", LOG_LEVEL_ALL); - LogComponentEnable("HtFrameExchangeManager", LOG_LEVEL_ALL); - LogComponentEnable("HtPhy", LOG_LEVEL_ALL); - LogComponentEnable("HtPpdu", LOG_LEVEL_ALL); - LogComponentEnable("IdealWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("InterferenceHelper", LOG_LEVEL_ALL); - LogComponentEnable("MacRxMiddle", LOG_LEVEL_ALL); - LogComponentEnable("MacTxMiddle", LOG_LEVEL_ALL); - LogComponentEnable("MinstrelHtWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("MinstrelWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("MpduAggregator", LOG_LEVEL_ALL); - LogComponentEnable("MsduAggregator", LOG_LEVEL_ALL); - LogComponentEnable("MultiUserScheduler", LOG_LEVEL_ALL); - LogComponentEnable("NistErrorRateModel", LOG_LEVEL_ALL); - LogComponentEnable("ObssPdAlgorithm", LOG_LEVEL_ALL); - LogComponentEnable("OfdmPhy", LOG_LEVEL_ALL); - LogComponentEnable("OfdmPpdu", LOG_LEVEL_ALL); - LogComponentEnable("OnoeWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("OriginatorBlockAckAgreement", LOG_LEVEL_ALL); - LogComponentEnable("ParfWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("PhyEntity", LOG_LEVEL_ALL); - LogComponentEnable("QosFrameExchangeManager", LOG_LEVEL_ALL); - LogComponentEnable("QosTxop", LOG_LEVEL_ALL); - LogComponentEnable("RecipientBlockAckAgreement", LOG_LEVEL_ALL); - LogComponentEnable("RrMultiUserScheduler", LOG_LEVEL_ALL); - LogComponentEnable("RraaWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("RrpaaWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("SimpleFrameCaptureModel", LOG_LEVEL_ALL); - LogComponentEnable("SpectrumWifiPhy", LOG_LEVEL_ALL); - LogComponentEnable("StaWifiMac", LOG_LEVEL_ALL); - LogComponentEnable("SupportedRates", LOG_LEVEL_ALL); - LogComponentEnable("TableBasedErrorRateModel", LOG_LEVEL_ALL); - LogComponentEnable("ThompsonSamplingWifiManager", LOG_LEVEL_ALL); - LogComponentEnable("ThresholdPreambleDetectionModel", LOG_LEVEL_ALL); - LogComponentEnable("Txop", LOG_LEVEL_ALL); - LogComponentEnable("VhtConfiguration", LOG_LEVEL_ALL); - LogComponentEnable("VhtFrameExchangeManager", LOG_LEVEL_ALL); - LogComponentEnable("VhtPhy", LOG_LEVEL_ALL); - LogComponentEnable("VhtPpdu", LOG_LEVEL_ALL); - LogComponentEnable("WifiAckManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiAssocManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiDefaultAckManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiDefaultAssocManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiDefaultProtectionManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiMac", LOG_LEVEL_ALL); - LogComponentEnable("WifiMacQueue", LOG_LEVEL_ALL); - LogComponentEnable("WifiMpdu", LOG_LEVEL_ALL); - LogComponentEnable("WifiNetDevice", LOG_LEVEL_ALL); - LogComponentEnable("WifiPhyStateHelper", LOG_LEVEL_ALL); - LogComponentEnable("WifiPhyOperatingChannel", LOG_LEVEL_ALL); - LogComponentEnable("WifiPhy", LOG_LEVEL_ALL); - LogComponentEnable("WifiPpdu", LOG_LEVEL_ALL); - LogComponentEnable("WifiProtectionManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiPsdu", LOG_LEVEL_ALL); - LogComponentEnable("WifiRadioEnergyModel", LOG_LEVEL_ALL); - LogComponentEnable("WifiRemoteStationManager", LOG_LEVEL_ALL); - LogComponentEnable("WifiSpectrumPhyInterface", LOG_LEVEL_ALL); - LogComponentEnable("WifiSpectrumSignalParameters", LOG_LEVEL_ALL); - LogComponentEnable("WifiTxCurrentModel", LOG_LEVEL_ALL); - LogComponentEnable("WifiTxParameters", LOG_LEVEL_ALL); - LogComponentEnable("WifiTxTimer", LOG_LEVEL_ALL); - LogComponentEnable("YansErrorRateModel", LOG_LEVEL_ALL); - LogComponentEnable("YansWifiChannel", LOG_LEVEL_ALL); - LogComponentEnable("YansWifiPhy", LOG_LEVEL_ALL); + LogComponentEnable("AarfWifiManager", logLevel); + LogComponentEnable("AarfcdWifiManager", logLevel); + LogComponentEnable("AdhocWifiMac", logLevel); + LogComponentEnable("AmrrWifiManager", logLevel); + LogComponentEnable("ApWifiMac", logLevel); + LogComponentEnable("AparfWifiManager", logLevel); + LogComponentEnable("ArfWifiManager", logLevel); + LogComponentEnable("BlockAckAgreement", logLevel); + LogComponentEnable("BlockAckManager", logLevel); + LogComponentEnable("CaraWifiManager", logLevel); + LogComponentEnable("ChannelAccessManager", logLevel); + LogComponentEnable("ConstantObssPdAlgorithm", logLevel); + LogComponentEnable("ConstantRateWifiManager", logLevel); + LogComponentEnable("DefaultEmlsrManager", logLevel); + LogComponentEnable("DsssErrorRateModel", logLevel); + LogComponentEnable("DsssPhy", logLevel); + LogComponentEnable("DsssPpdu", logLevel); + LogComponentEnable("EhtFrameExchangeManager", logLevel); + LogComponentEnable("EhtPhy", logLevel); + LogComponentEnable("EhtPpdu", logLevel); + LogComponentEnable("EmlsrManager", logLevel); + LogComponentEnable("ErpOfdmPhy", logLevel); + LogComponentEnable("ErpOfdmPpdu", logLevel); + LogComponentEnable("FrameExchangeManager", logLevel); + LogComponentEnable("HeConfiguration", logLevel); + LogComponentEnable("HeFrameExchangeManager", logLevel); + LogComponentEnable("HePhy", logLevel); + LogComponentEnable("HePpdu", logLevel); + LogComponentEnable("HtConfiguration", logLevel); + LogComponentEnable("HtFrameExchangeManager", logLevel); + LogComponentEnable("HtPhy", logLevel); + LogComponentEnable("HtPpdu", logLevel); + LogComponentEnable("IdealWifiManager", logLevel); + LogComponentEnable("InterferenceHelper", logLevel); + LogComponentEnable("MacRxMiddle", logLevel); + LogComponentEnable("MacTxMiddle", logLevel); + LogComponentEnable("MinstrelHtWifiManager", logLevel); + LogComponentEnable("MinstrelWifiManager", logLevel); + LogComponentEnable("MpduAggregator", logLevel); + LogComponentEnable("MsduAggregator", logLevel); + LogComponentEnable("MultiUserScheduler", logLevel); + LogComponentEnable("NistErrorRateModel", logLevel); + LogComponentEnable("ObssPdAlgorithm", logLevel); + LogComponentEnable("OfdmPhy", logLevel); + LogComponentEnable("OfdmPpdu", logLevel); + LogComponentEnable("OnoeWifiManager", logLevel); + LogComponentEnable("OriginatorBlockAckAgreement", logLevel); + LogComponentEnable("ParfWifiManager", logLevel); + LogComponentEnable("PhyEntity", logLevel); + LogComponentEnable("QosFrameExchangeManager", logLevel); + LogComponentEnable("QosTxop", logLevel); + LogComponentEnable("RecipientBlockAckAgreement", logLevel); + LogComponentEnable("RrMultiUserScheduler", logLevel); + LogComponentEnable("RraaWifiManager", logLevel); + LogComponentEnable("RrpaaWifiManager", logLevel); + LogComponentEnable("SimpleFrameCaptureModel", logLevel); + LogComponentEnable("SpectrumWifiPhy", logLevel); + LogComponentEnable("StaWifiMac", logLevel); + LogComponentEnable("SupportedRates", logLevel); + LogComponentEnable("TableBasedErrorRateModel", logLevel); + LogComponentEnable("ThompsonSamplingWifiManager", logLevel); + LogComponentEnable("ThresholdPreambleDetectionModel", logLevel); + LogComponentEnable("Txop", logLevel); + LogComponentEnable("VhtConfiguration", logLevel); + LogComponentEnable("VhtFrameExchangeManager", logLevel); + LogComponentEnable("VhtPhy", logLevel); + LogComponentEnable("VhtPpdu", logLevel); + LogComponentEnable("WifiAckManager", logLevel); + LogComponentEnable("WifiAssocManager", logLevel); + LogComponentEnable("WifiDefaultAckManager", logLevel); + LogComponentEnable("WifiDefaultAssocManager", logLevel); + LogComponentEnable("WifiDefaultProtectionManager", logLevel); + LogComponentEnable("WifiMac", logLevel); + LogComponentEnable("WifiMacQueue", logLevel); + LogComponentEnable("WifiMpdu", logLevel); + LogComponentEnable("WifiNetDevice", logLevel); + LogComponentEnable("WifiPhyStateHelper", logLevel); + LogComponentEnable("WifiPhyOperatingChannel", logLevel); + LogComponentEnable("WifiPhy", logLevel); + LogComponentEnable("WifiPpdu", logLevel); + LogComponentEnable("WifiProtectionManager", logLevel); + LogComponentEnable("WifiPsdu", logLevel); + LogComponentEnable("WifiRadioEnergyModel", logLevel); + LogComponentEnable("WifiRemoteStationManager", logLevel); + LogComponentEnable("WifiSpectrumPhyInterface", logLevel); + LogComponentEnable("WifiSpectrumSignalParameters", logLevel); + LogComponentEnable("WifiTxCurrentModel", logLevel); + LogComponentEnable("WifiTxParameters", logLevel); + LogComponentEnable("WifiTxTimer", logLevel); + LogComponentEnable("YansErrorRateModel", logLevel); + LogComponentEnable("YansWifiChannel", logLevel); + LogComponentEnable("YansWifiPhy", logLevel); - LogComponentEnable("Athstats", LOG_LEVEL_ALL); - LogComponentEnable("WifiHelper", LOG_LEVEL_ALL); - LogComponentEnable("SpectrumWifiHelper", LOG_LEVEL_ALL); - LogComponentEnable("YansWifiHelper", LOG_LEVEL_ALL); + LogComponentEnable("Athstats", logLevel); + LogComponentEnable("WifiHelper", logLevel); + LogComponentEnable("SpectrumWifiHelper", logLevel); + LogComponentEnable("YansWifiHelper", logLevel); // From Spectrum - LogComponentEnable("WifiSpectrumValueHelper", LOG_LEVEL_ALL); + LogComponentEnable("WifiSpectrumValueHelper", logLevel); } int64_t diff --git a/src/wifi/helper/wifi-helper.h b/src/wifi/helper/wifi-helper.h index 7a9ccec6c..aad6b1089 100644 --- a/src/wifi/helper/wifi-helper.h +++ b/src/wifi/helper/wifi-helper.h @@ -497,8 +497,9 @@ class WifiHelper /** * Helper to enable all WifiNetDevice log components with one statement + * \param logLevel (optional) log level setting */ - static void EnableLogComponents(); + static void EnableLogComponents(LogLevel logLevel = LOG_LEVEL_ALL); /** * Assign a fixed random variable stream number to the random variables