From a387d0cd1e1d10ddefd7da97e3d510c9a7b4050e Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Tue, 3 May 2022 21:57:58 +0200 Subject: [PATCH] Rescan python bindings --- src/netanim/bindings/modulegen__gcc_ILP32.py | 8 ++++---- src/netanim/bindings/modulegen__gcc_LP64.py | 8 ++++---- src/wave/bindings/modulegen__gcc_ILP32.py | 10 +++++----- src/wave/bindings/modulegen__gcc_LP64.py | 10 +++++----- src/wifi/bindings/modulegen__gcc_ILP32.py | 21 ++++++++++---------- src/wifi/bindings/modulegen__gcc_LP64.py | 21 ++++++++++---------- 6 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/netanim/bindings/modulegen__gcc_ILP32.py b/src/netanim/bindings/modulegen__gcc_ILP32.py index ca0529ce2..45cdeb250 100644 --- a/src/netanim/bindings/modulegen__gcc_ILP32.py +++ b/src/netanim/bindings/modulegen__gcc_ILP32.py @@ -12478,10 +12478,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SetReceiveOkCallback', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::WifiPsdu >, ns3::RxSignalInfo, ns3::WifiTxVector, std::vector< bool >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff() [member function] cls.add_method('SwitchFromOff', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxAbort() [member function] cls.add_method('SwitchFromRxAbort', 'void', @@ -12494,10 +12494,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SwitchFromRxEndOk', 'void', [param('ns3::Ptr< ns3::WifiPsdu >', 'psdu'), param('ns3::RxSignalInfo', 'rxSignalInfo'), param('ns3::WifiTxVector', 'txVector'), param('uint16_t', 'staId'), param('std::vector< bool >', 'statusPerMpdu')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep() [member function] cls.add_method('SwitchFromSleep', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchMaybeToCcaBusy(ns3::Time duration) [member function] cls.add_method('SwitchMaybeToCcaBusy', 'void', diff --git a/src/netanim/bindings/modulegen__gcc_LP64.py b/src/netanim/bindings/modulegen__gcc_LP64.py index 552a6ef52..17447eabc 100644 --- a/src/netanim/bindings/modulegen__gcc_LP64.py +++ b/src/netanim/bindings/modulegen__gcc_LP64.py @@ -12478,10 +12478,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SetReceiveOkCallback', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::WifiPsdu >, ns3::RxSignalInfo, ns3::WifiTxVector, std::vector< bool >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff() [member function] cls.add_method('SwitchFromOff', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxAbort() [member function] cls.add_method('SwitchFromRxAbort', 'void', @@ -12494,10 +12494,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SwitchFromRxEndOk', 'void', [param('ns3::Ptr< ns3::WifiPsdu >', 'psdu'), param('ns3::RxSignalInfo', 'rxSignalInfo'), param('ns3::WifiTxVector', 'txVector'), param('uint16_t', 'staId'), param('std::vector< bool >', 'statusPerMpdu')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep() [member function] cls.add_method('SwitchFromSleep', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchMaybeToCcaBusy(ns3::Time duration) [member function] cls.add_method('SwitchMaybeToCcaBusy', 'void', diff --git a/src/wave/bindings/modulegen__gcc_ILP32.py b/src/wave/bindings/modulegen__gcc_ILP32.py index 570406194..ffef22c6d 100644 --- a/src/wave/bindings/modulegen__gcc_ILP32.py +++ b/src/wave/bindings/modulegen__gcc_ILP32.py @@ -11740,10 +11740,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SetReceiveOkCallback', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::WifiPsdu >, ns3::RxSignalInfo, ns3::WifiTxVector, std::vector< bool >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff() [member function] cls.add_method('SwitchFromOff', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxAbort() [member function] cls.add_method('SwitchFromRxAbort', 'void', @@ -11756,10 +11756,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SwitchFromRxEndOk', 'void', [param('ns3::Ptr< ns3::WifiPsdu >', 'psdu'), param('ns3::RxSignalInfo', 'rxSignalInfo'), param('ns3::WifiTxVector', 'txVector'), param('uint16_t', 'staId'), param('std::vector< bool >', 'statusPerMpdu')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep() [member function] cls.add_method('SwitchFromSleep', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchMaybeToCcaBusy(ns3::Time duration) [member function] cls.add_method('SwitchMaybeToCcaBusy', 'void', @@ -15292,7 +15292,7 @@ def register_Ns3FrameExchangeManager_methods(root_module, cls): cls.add_method('NormalAckTimeout', 'void', [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'mpdu'), param('ns3::WifiTxVector const &', 'txVector')], - visibility='protected') + is_virtual=True, visibility='protected') ## frame-exchange-manager.h (module 'wifi'): void ns3::FrameExchangeManager::NotifyPacketDiscarded(ns3::Ptr mpdu) [member function] cls.add_method('NotifyPacketDiscarded', 'void', diff --git a/src/wave/bindings/modulegen__gcc_LP64.py b/src/wave/bindings/modulegen__gcc_LP64.py index d0d8bcb76..258464960 100644 --- a/src/wave/bindings/modulegen__gcc_LP64.py +++ b/src/wave/bindings/modulegen__gcc_LP64.py @@ -11740,10 +11740,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SetReceiveOkCallback', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::WifiPsdu >, ns3::RxSignalInfo, ns3::WifiTxVector, std::vector< bool >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff() [member function] cls.add_method('SwitchFromOff', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxAbort() [member function] cls.add_method('SwitchFromRxAbort', 'void', @@ -11756,10 +11756,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SwitchFromRxEndOk', 'void', [param('ns3::Ptr< ns3::WifiPsdu >', 'psdu'), param('ns3::RxSignalInfo', 'rxSignalInfo'), param('ns3::WifiTxVector', 'txVector'), param('uint16_t', 'staId'), param('std::vector< bool >', 'statusPerMpdu')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep() [member function] cls.add_method('SwitchFromSleep', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchMaybeToCcaBusy(ns3::Time duration) [member function] cls.add_method('SwitchMaybeToCcaBusy', 'void', @@ -15292,7 +15292,7 @@ def register_Ns3FrameExchangeManager_methods(root_module, cls): cls.add_method('NormalAckTimeout', 'void', [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'mpdu'), param('ns3::WifiTxVector const &', 'txVector')], - visibility='protected') + is_virtual=True, visibility='protected') ## frame-exchange-manager.h (module 'wifi'): void ns3::FrameExchangeManager::NotifyPacketDiscarded(ns3::Ptr mpdu) [member function] cls.add_method('NotifyPacketDiscarded', 'void', diff --git a/src/wifi/bindings/modulegen__gcc_ILP32.py b/src/wifi/bindings/modulegen__gcc_ILP32.py index b4e3dcb03..59896b342 100644 --- a/src/wifi/bindings/modulegen__gcc_ILP32.py +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py @@ -12694,10 +12694,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SetReceiveOkCallback', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::WifiPsdu >, ns3::RxSignalInfo, ns3::WifiTxVector, std::vector< bool >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff() [member function] cls.add_method('SwitchFromOff', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxAbort() [member function] cls.add_method('SwitchFromRxAbort', 'void', @@ -12710,10 +12710,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SwitchFromRxEndOk', 'void', [param('ns3::Ptr< ns3::WifiPsdu >', 'psdu'), param('ns3::RxSignalInfo', 'rxSignalInfo'), param('ns3::WifiTxVector', 'txVector'), param('uint16_t', 'staId'), param('std::vector< bool >', 'statusPerMpdu')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep() [member function] cls.add_method('SwitchFromSleep', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchMaybeToCcaBusy(ns3::Time duration) [member function] cls.add_method('SwitchMaybeToCcaBusy', 'void', @@ -14267,11 +14267,6 @@ def register_Ns3ApWifiMac_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## ap-wifi-mac.h (module 'wifi'): uint16_t ns3::ApWifiMac::GetVhtOperationalChannelWidth() const [member function] - cls.add_method('GetVhtOperationalChannelWidth', - 'uint16_t', - [], - is_const=True) ## ap-wifi-mac.h (module 'wifi'): void ns3::ApWifiMac::SetAddress(ns3::Mac48Address address) [member function] cls.add_method('SetAddress', 'void', @@ -27522,10 +27517,14 @@ def register_functions(root_module): module.add_function('GetBlockAckSize', 'uint32_t', [param('ns3::BlockAckType', 'type')]) - ## wifi-phy-common.h (module 'wifi'): uint16_t ns3::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t maxSupportedChannelWidth) [free function] + ## wifi-phy-common.h (module 'wifi'): uint16_t ns3::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t maxAllowedChannelWidth) [free function] module.add_function('GetChannelWidthForTransmission', 'uint16_t', - [param('ns3::WifiMode', 'mode'), param('uint16_t', 'maxSupportedChannelWidth')]) + [param('ns3::WifiMode', 'mode'), param('uint16_t', 'maxAllowedChannelWidth')]) + ## wifi-phy-common.h (module 'wifi'): uint16_t ns3::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t operatingChannelWidth, uint16_t maxSupportedChannelWidth) [free function] + module.add_function('GetChannelWidthForTransmission', + 'uint16_t', + [param('ns3::WifiMode', 'mode'), param('uint16_t', 'operatingChannelWidth'), param('uint16_t', 'maxSupportedChannelWidth')]) ## wifi-utils.h (module 'wifi'): uint32_t ns3::GetCtsSize() [free function] module.add_function('GetCtsSize', 'uint32_t', diff --git a/src/wifi/bindings/modulegen__gcc_LP64.py b/src/wifi/bindings/modulegen__gcc_LP64.py index 9467154c4..425ca5df8 100644 --- a/src/wifi/bindings/modulegen__gcc_LP64.py +++ b/src/wifi/bindings/modulegen__gcc_LP64.py @@ -12694,10 +12694,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SetReceiveOkCallback', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::WifiPsdu >, ns3::RxSignalInfo, ns3::WifiTxVector, std::vector< bool >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromOff() [member function] cls.add_method('SwitchFromOff', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxAbort() [member function] cls.add_method('SwitchFromRxAbort', 'void', @@ -12710,10 +12710,10 @@ def register_Ns3WifiPhyStateHelper_methods(root_module, cls): cls.add_method('SwitchFromRxEndOk', 'void', [param('ns3::Ptr< ns3::WifiPsdu >', 'psdu'), param('ns3::RxSignalInfo', 'rxSignalInfo'), param('ns3::WifiTxVector', 'txVector'), param('uint16_t', 'staId'), param('std::vector< bool >', 'statusPerMpdu')]) - ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function] + ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep() [member function] cls.add_method('SwitchFromSleep', 'void', - [param('ns3::Time', 'duration')]) + []) ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchMaybeToCcaBusy(ns3::Time duration) [member function] cls.add_method('SwitchMaybeToCcaBusy', 'void', @@ -14267,11 +14267,6 @@ def register_Ns3ApWifiMac_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## ap-wifi-mac.h (module 'wifi'): uint16_t ns3::ApWifiMac::GetVhtOperationalChannelWidth() const [member function] - cls.add_method('GetVhtOperationalChannelWidth', - 'uint16_t', - [], - is_const=True) ## ap-wifi-mac.h (module 'wifi'): void ns3::ApWifiMac::SetAddress(ns3::Mac48Address address) [member function] cls.add_method('SetAddress', 'void', @@ -27522,10 +27517,14 @@ def register_functions(root_module): module.add_function('GetBlockAckSize', 'uint32_t', [param('ns3::BlockAckType', 'type')]) - ## wifi-phy-common.h (module 'wifi'): uint16_t ns3::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t maxSupportedChannelWidth) [free function] + ## wifi-phy-common.h (module 'wifi'): uint16_t ns3::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t maxAllowedChannelWidth) [free function] module.add_function('GetChannelWidthForTransmission', 'uint16_t', - [param('ns3::WifiMode', 'mode'), param('uint16_t', 'maxSupportedChannelWidth')]) + [param('ns3::WifiMode', 'mode'), param('uint16_t', 'maxAllowedChannelWidth')]) + ## wifi-phy-common.h (module 'wifi'): uint16_t ns3::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t operatingChannelWidth, uint16_t maxSupportedChannelWidth) [free function] + module.add_function('GetChannelWidthForTransmission', + 'uint16_t', + [param('ns3::WifiMode', 'mode'), param('uint16_t', 'operatingChannelWidth'), param('uint16_t', 'maxSupportedChannelWidth')]) ## wifi-utils.h (module 'wifi'): uint32_t ns3::GetCtsSize() [free function] module.add_function('GetCtsSize', 'uint32_t',