From 34663dbfd38b3569f14d0fa29a77cf2adac5a891 Mon Sep 17 00:00:00 2001 From: Stefano Avallone Date: Wed, 20 Oct 2021 16:32:44 +0200 Subject: [PATCH] wifi: Rescan python bindings --- src/wifi/bindings/modulegen__gcc_ILP32.py | 98 ++++++++++------------- src/wifi/bindings/modulegen__gcc_LP64.py | 98 ++++++++++------------- 2 files changed, 88 insertions(+), 108 deletions(-) diff --git a/src/wifi/bindings/modulegen__gcc_ILP32.py b/src/wifi/bindings/modulegen__gcc_ILP32.py index a38b3057e..c21f426d3 100644 --- a/src/wifi/bindings/modulegen__gcc_ILP32.py +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py @@ -11619,6 +11619,11 @@ def register_Ns3WifiMacQueueItem_methods(root_module, cls): cls.add_method('GetHeader', 'ns3::WifiMacHeader &', []) + ## wifi-mac-queue-item.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueueItem::GetItem() const [member function] + cls.add_method('GetItem', + 'ns3::Ptr< ns3::WifiMacQueueItem >', + [], + is_const=True) ## wifi-mac-queue-item.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueueItem::GetPacket() const [member function] cls.add_method('GetPacket', 'ns3::Ptr< ns3::Packet const >', @@ -11639,11 +11644,6 @@ def register_Ns3WifiMacQueueItem_methods(root_module, cls): 'ns3::AcIndex', [], is_const=True) - ## wifi-mac-queue-item.h (module 'wifi'): ns3::WifiMacQueueItem::ConstIterator ns3::WifiMacQueueItem::GetQueueIterator() const [member function] - cls.add_method('GetQueueIterator', - 'ns3::WifiMacQueueItem::ConstIterator', - [], - is_const=True) ## wifi-mac-queue-item.h (module 'wifi'): uint32_t ns3::WifiMacQueueItem::GetSize() const [member function] cls.add_method('GetSize', 'uint32_t', @@ -14435,21 +14435,16 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): [param('std::string const &', 'mangled')], is_static=True, visibility='protected') ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, template_parameters=['void'], visibility='protected') - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, template_parameters=['ns3::Ptr '], visibility='protected') - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], is_static=True, template_parameters=['ns3::ObjectBase*'], visibility='protected') ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, template_parameters=['void'], visibility='protected') + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], @@ -14510,6 +14505,11 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): [], is_static=True, template_parameters=['ns3::WifiMacDropReason'], visibility='protected') ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, template_parameters=['ns3::Ptr '], visibility='protected') + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], @@ -19190,10 +19190,10 @@ def register_Ns3MpduAggregator_methods(root_module, cls): 'uint32_t', [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::WifiModulationClass', 'modulation')], is_const=True) - ## mpdu-aggregator.h (module 'wifi'): std::vector, std::allocator > > ns3::MpduAggregator::GetNextAmpdu(ns3::Ptr mpdu, ns3::WifiTxParameters & txParams, ns3::Time availableTime, ns3::WifiMacQueueItem::ConstIterator queueIt) const [member function] + ## mpdu-aggregator.h (module 'wifi'): std::vector, std::allocator > > ns3::MpduAggregator::GetNextAmpdu(ns3::Ptr mpdu, ns3::WifiTxParameters & txParams, ns3::Time availableTime) const [member function] cls.add_method('GetNextAmpdu', 'std::vector< ns3::Ptr< ns3::WifiMacQueueItem > >', - [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'mpdu'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'queueIt')], + [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'mpdu'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime')], is_const=True) ## mpdu-aggregator.h (module 'wifi'): static uint32_t ns3::MpduAggregator::GetSizeIfAggregated(uint32_t mpduSize, uint32_t ampduSize) [member function] cls.add_method('GetSizeIfAggregated', @@ -19236,10 +19236,10 @@ def register_Ns3MsduAggregator_methods(root_module, cls): 'uint16_t', [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::WifiModulationClass', 'modulation')], is_const=True) - ## msdu-aggregator.h (module 'wifi'): ns3::Ptr ns3::MsduAggregator::GetNextAmsdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime, ns3::WifiMacQueueItem::ConstIterator & queueIt) const [member function] + ## msdu-aggregator.h (module 'wifi'): ns3::Ptr ns3::MsduAggregator::GetNextAmsdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime) const [member function] cls.add_method('GetNextAmsdu', 'ns3::Ptr< ns3::WifiMacQueueItem >', - [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('ns3::WifiMacQueueItem::ConstIterator &', 'queueIt')], + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime')], is_const=True) ## msdu-aggregator.h (module 'wifi'): static uint16_t ns3::MsduAggregator::GetSizeIfAggregated(uint16_t msduSize, uint16_t amsduSize) [member function] cls.add_method('GetSizeIfAggregated', @@ -20947,10 +20947,10 @@ def register_Ns3QosTxop_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) - ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::GetNextMpdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime, bool initialFrame, ns3::WifiMacQueueItem::ConstIterator & queueIt) [member function] + ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::GetNextMpdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime, bool initialFrame) [member function] cls.add_method('GetNextMpdu', 'ns3::Ptr< ns3::WifiMacQueueItem >', - [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('bool', 'initialFrame'), param('ns3::WifiMacQueueItem::ConstIterator &', 'queueIt')]) + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('bool', 'initialFrame')]) ## qos-txop.h (module 'wifi'): uint16_t ns3::QosTxop::GetNextSequenceNumberFor(ns3::WifiMacHeader const * hdr) [member function] cls.add_method('GetNextSequenceNumberFor', 'uint16_t', @@ -21008,14 +21008,10 @@ def register_Ns3QosTxop_methods(root_module, cls): 'void', [], is_virtual=True) - ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::PeekNextMpdu(uint8_t tid=8, ns3::Mac48Address recipient=ns3::Mac48Address::GetBroadcast()) [member function] + ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::PeekNextMpdu(uint8_t tid=8, ns3::Mac48Address recipient=ns3::Mac48Address::GetBroadcast(), ns3::Ptr item=nullptr) [member function] cls.add_method('PeekNextMpdu', 'ns3::Ptr< ns3::WifiMacQueueItem const >', - [param('uint8_t', 'tid', default_value='8'), param('ns3::Mac48Address', 'recipient', default_value='ns3::Mac48Address::GetBroadcast()')]) - ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::PeekNextMpdu(ns3::WifiMacQueueItem::ConstIterator queueIt, uint8_t tid=8, ns3::Mac48Address recipient=ns3::Mac48Address::GetBroadcast()) [member function] - cls.add_method('PeekNextMpdu', - 'ns3::Ptr< ns3::WifiMacQueueItem const >', - [param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'queueIt'), param('uint8_t', 'tid', default_value='8'), param('ns3::Mac48Address', 'recipient', default_value='ns3::Mac48Address::GetBroadcast()')]) + [param('uint8_t', 'tid', default_value='8'), param('ns3::Mac48Address', 'recipient', default_value='ns3::Mac48Address::GetBroadcast()'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')]) ## qos-txop.h (module 'wifi'): uint16_t ns3::QosTxop::PeekNextSequenceNumberFor(ns3::WifiMacHeader const * hdr) [member function] cls.add_method('PeekNextSequenceNumberFor', 'uint16_t', @@ -23270,10 +23266,6 @@ def register_Ns3WifiMacQueue_methods(root_module, cls): cls.add_method('PushFront', 'bool', [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'item')]) - ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::Insert(ns3::Queue::ConstIterator pos, ns3::Ptr item) [member function] - cls.add_method('Insert', - 'bool', - [param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos'), param('ns3::Ptr< ns3::WifiMacQueueItem >', 'item')]) ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::Dequeue() [member function] cls.add_method('Dequeue', 'ns3::Ptr< ns3::WifiMacQueueItem >', @@ -23288,39 +23280,39 @@ def register_Ns3WifiMacQueue_methods(root_module, cls): 'ns3::Ptr< ns3::WifiMacQueueItem const >', [], is_const=True, is_virtual=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekByAddress(ns3::Mac48Address dest, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekByAddress(ns3::Mac48Address dest, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekByAddress', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('ns3::Mac48Address', 'dest'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('ns3::Mac48Address', 'dest'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekByTid(uint8_t tid, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekByTid(uint8_t tid, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekByTid', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('uint8_t', 'tid'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('uint8_t', 'tid'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekByTidAndAddress(uint8_t tid, ns3::Mac48Address dest, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekByTidAndAddress(uint8_t tid, ns3::Mac48Address dest, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekByTidAndAddress', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'dest'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'dest'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekFirstAvailable(ns3::Ptr const blockedPackets=nullptr, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekFirstAvailable(ns3::Ptr const blockedPackets=nullptr, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekFirstAvailable', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('ns3::Ptr< ns3::QosBlockedDestinations > const', 'blockedPackets', default_value='nullptr'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('ns3::Ptr< ns3::QosBlockedDestinations > const', 'blockedPackets', default_value='nullptr'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::Remove() [member function] cls.add_method('Remove', 'ns3::Ptr< ns3::WifiMacQueueItem >', [], is_virtual=True) - ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::Remove(ns3::Ptr packet) [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::Remove(ns3::Ptr item, bool removeExpired=false) [member function] cls.add_method('Remove', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'packet')]) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::Remove(ns3::Queue::ConstIterator pos, bool removeExpired=false) [member function] - cls.add_method('Remove', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos'), param('bool', 'removeExpired', default_value='false')]) + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item'), param('bool', 'removeExpired', default_value='false')]) + ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Replace(ns3::Ptr currentItem, ns3::Ptr newItem) [member function] + cls.add_method('Replace', + 'void', + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'currentItem'), param('ns3::Ptr< ns3::WifiMacQueueItem >', 'newItem')]) ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetNPacketsByAddress(ns3::Mac48Address dest) [member function] cls.add_method('GetNPacketsByAddress', 'uint32_t', @@ -23351,12 +23343,10 @@ def register_Ns3WifiMacQueue_methods(root_module, cls): cls.add_method('GetNBytes', 'uint32_t', []) - ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::TtlExceeded(ns3::Queue::ConstIterator & it, ns3::Time const & now) [member function] + ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::TtlExceeded(ns3::Ptr item, ns3::Time const & now) [member function] cls.add_method('TtlExceeded', 'bool', - [param('ns3::Queue< ns3::WifiMacQueueItem > ConstIterator &', 'it'), param('ns3::Time const &', 'now')]) - ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::EMPTY [variable] - cls.add_static_attribute('EMPTY', 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator const', is_const=True) + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item'), param('ns3::Time const &', 'now')]) ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::WifiMacQueue(ns3::WifiMacQueue const & arg0) [constructor] cls.add_constructor([param('ns3::WifiMacQueue const &', 'arg0')]) return diff --git a/src/wifi/bindings/modulegen__gcc_LP64.py b/src/wifi/bindings/modulegen__gcc_LP64.py index df40c4e75..a32afceb6 100644 --- a/src/wifi/bindings/modulegen__gcc_LP64.py +++ b/src/wifi/bindings/modulegen__gcc_LP64.py @@ -11619,6 +11619,11 @@ def register_Ns3WifiMacQueueItem_methods(root_module, cls): cls.add_method('GetHeader', 'ns3::WifiMacHeader &', []) + ## wifi-mac-queue-item.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueueItem::GetItem() const [member function] + cls.add_method('GetItem', + 'ns3::Ptr< ns3::WifiMacQueueItem >', + [], + is_const=True) ## wifi-mac-queue-item.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueueItem::GetPacket() const [member function] cls.add_method('GetPacket', 'ns3::Ptr< ns3::Packet const >', @@ -11639,11 +11644,6 @@ def register_Ns3WifiMacQueueItem_methods(root_module, cls): 'ns3::AcIndex', [], is_const=True) - ## wifi-mac-queue-item.h (module 'wifi'): ns3::WifiMacQueueItem::ConstIterator ns3::WifiMacQueueItem::GetQueueIterator() const [member function] - cls.add_method('GetQueueIterator', - 'ns3::WifiMacQueueItem::ConstIterator', - [], - is_const=True) ## wifi-mac-queue-item.h (module 'wifi'): uint32_t ns3::WifiMacQueueItem::GetSize() const [member function] cls.add_method('GetSize', 'uint32_t', @@ -14435,21 +14435,16 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): [param('std::string const &', 'mangled')], is_static=True, visibility='protected') ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, template_parameters=['void'], visibility='protected') - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, template_parameters=['ns3::Ptr '], visibility='protected') - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], is_static=True, template_parameters=['ns3::ObjectBase*'], visibility='protected') ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, template_parameters=['void'], visibility='protected') + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], @@ -14510,6 +14505,11 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): [], is_static=True, template_parameters=['ns3::WifiMacDropReason'], visibility='protected') ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, template_parameters=['ns3::Ptr '], visibility='protected') + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], @@ -19190,10 +19190,10 @@ def register_Ns3MpduAggregator_methods(root_module, cls): 'uint32_t', [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::WifiModulationClass', 'modulation')], is_const=True) - ## mpdu-aggregator.h (module 'wifi'): std::vector, std::allocator > > ns3::MpduAggregator::GetNextAmpdu(ns3::Ptr mpdu, ns3::WifiTxParameters & txParams, ns3::Time availableTime, ns3::WifiMacQueueItem::ConstIterator queueIt) const [member function] + ## mpdu-aggregator.h (module 'wifi'): std::vector, std::allocator > > ns3::MpduAggregator::GetNextAmpdu(ns3::Ptr mpdu, ns3::WifiTxParameters & txParams, ns3::Time availableTime) const [member function] cls.add_method('GetNextAmpdu', 'std::vector< ns3::Ptr< ns3::WifiMacQueueItem > >', - [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'mpdu'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'queueIt')], + [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'mpdu'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime')], is_const=True) ## mpdu-aggregator.h (module 'wifi'): static uint32_t ns3::MpduAggregator::GetSizeIfAggregated(uint32_t mpduSize, uint32_t ampduSize) [member function] cls.add_method('GetSizeIfAggregated', @@ -19236,10 +19236,10 @@ def register_Ns3MsduAggregator_methods(root_module, cls): 'uint16_t', [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::WifiModulationClass', 'modulation')], is_const=True) - ## msdu-aggregator.h (module 'wifi'): ns3::Ptr ns3::MsduAggregator::GetNextAmsdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime, ns3::WifiMacQueueItem::ConstIterator & queueIt) const [member function] + ## msdu-aggregator.h (module 'wifi'): ns3::Ptr ns3::MsduAggregator::GetNextAmsdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime) const [member function] cls.add_method('GetNextAmsdu', 'ns3::Ptr< ns3::WifiMacQueueItem >', - [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('ns3::WifiMacQueueItem::ConstIterator &', 'queueIt')], + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime')], is_const=True) ## msdu-aggregator.h (module 'wifi'): static uint16_t ns3::MsduAggregator::GetSizeIfAggregated(uint16_t msduSize, uint16_t amsduSize) [member function] cls.add_method('GetSizeIfAggregated', @@ -20947,10 +20947,10 @@ def register_Ns3QosTxop_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) - ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::GetNextMpdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime, bool initialFrame, ns3::WifiMacQueueItem::ConstIterator & queueIt) [member function] + ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::GetNextMpdu(ns3::Ptr peekedItem, ns3::WifiTxParameters & txParams, ns3::Time availableTime, bool initialFrame) [member function] cls.add_method('GetNextMpdu', 'ns3::Ptr< ns3::WifiMacQueueItem >', - [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('bool', 'initialFrame'), param('ns3::WifiMacQueueItem::ConstIterator &', 'queueIt')]) + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'peekedItem'), param('ns3::WifiTxParameters &', 'txParams'), param('ns3::Time', 'availableTime'), param('bool', 'initialFrame')]) ## qos-txop.h (module 'wifi'): uint16_t ns3::QosTxop::GetNextSequenceNumberFor(ns3::WifiMacHeader const * hdr) [member function] cls.add_method('GetNextSequenceNumberFor', 'uint16_t', @@ -21008,14 +21008,10 @@ def register_Ns3QosTxop_methods(root_module, cls): 'void', [], is_virtual=True) - ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::PeekNextMpdu(uint8_t tid=8, ns3::Mac48Address recipient=ns3::Mac48Address::GetBroadcast()) [member function] + ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::PeekNextMpdu(uint8_t tid=8, ns3::Mac48Address recipient=ns3::Mac48Address::GetBroadcast(), ns3::Ptr item=nullptr) [member function] cls.add_method('PeekNextMpdu', 'ns3::Ptr< ns3::WifiMacQueueItem const >', - [param('uint8_t', 'tid', default_value='8'), param('ns3::Mac48Address', 'recipient', default_value='ns3::Mac48Address::GetBroadcast()')]) - ## qos-txop.h (module 'wifi'): ns3::Ptr ns3::QosTxop::PeekNextMpdu(ns3::WifiMacQueueItem::ConstIterator queueIt, uint8_t tid=8, ns3::Mac48Address recipient=ns3::Mac48Address::GetBroadcast()) [member function] - cls.add_method('PeekNextMpdu', - 'ns3::Ptr< ns3::WifiMacQueueItem const >', - [param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'queueIt'), param('uint8_t', 'tid', default_value='8'), param('ns3::Mac48Address', 'recipient', default_value='ns3::Mac48Address::GetBroadcast()')]) + [param('uint8_t', 'tid', default_value='8'), param('ns3::Mac48Address', 'recipient', default_value='ns3::Mac48Address::GetBroadcast()'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')]) ## qos-txop.h (module 'wifi'): uint16_t ns3::QosTxop::PeekNextSequenceNumberFor(ns3::WifiMacHeader const * hdr) [member function] cls.add_method('PeekNextSequenceNumberFor', 'uint16_t', @@ -23270,10 +23266,6 @@ def register_Ns3WifiMacQueue_methods(root_module, cls): cls.add_method('PushFront', 'bool', [param('ns3::Ptr< ns3::WifiMacQueueItem >', 'item')]) - ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::Insert(ns3::Queue::ConstIterator pos, ns3::Ptr item) [member function] - cls.add_method('Insert', - 'bool', - [param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos'), param('ns3::Ptr< ns3::WifiMacQueueItem >', 'item')]) ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::Dequeue() [member function] cls.add_method('Dequeue', 'ns3::Ptr< ns3::WifiMacQueueItem >', @@ -23288,39 +23280,39 @@ def register_Ns3WifiMacQueue_methods(root_module, cls): 'ns3::Ptr< ns3::WifiMacQueueItem const >', [], is_const=True, is_virtual=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekByAddress(ns3::Mac48Address dest, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekByAddress(ns3::Mac48Address dest, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekByAddress', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('ns3::Mac48Address', 'dest'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('ns3::Mac48Address', 'dest'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekByTid(uint8_t tid, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekByTid(uint8_t tid, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekByTid', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('uint8_t', 'tid'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('uint8_t', 'tid'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekByTidAndAddress(uint8_t tid, ns3::Mac48Address dest, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekByTidAndAddress(uint8_t tid, ns3::Mac48Address dest, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekByTidAndAddress', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'dest'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'dest'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::PeekFirstAvailable(ns3::Ptr const blockedPackets=nullptr, ns3::Queue::ConstIterator pos=ns3::WifiMacQueue::EMPTY) const [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::PeekFirstAvailable(ns3::Ptr const blockedPackets=nullptr, ns3::Ptr item=nullptr) const [member function] cls.add_method('PeekFirstAvailable', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('ns3::Ptr< ns3::QosBlockedDestinations > const', 'blockedPackets', default_value='nullptr'), param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos', default_value='ns3::WifiMacQueue::EMPTY')], + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('ns3::Ptr< ns3::QosBlockedDestinations > const', 'blockedPackets', default_value='nullptr'), param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item', default_value='nullptr')], is_const=True) ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::Remove() [member function] cls.add_method('Remove', 'ns3::Ptr< ns3::WifiMacQueueItem >', [], is_virtual=True) - ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::Remove(ns3::Ptr packet) [member function] + ## wifi-mac-queue.h (module 'wifi'): ns3::Ptr ns3::WifiMacQueue::Remove(ns3::Ptr item, bool removeExpired=false) [member function] cls.add_method('Remove', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'packet')]) - ## wifi-mac-queue.h (module 'wifi'): ns3::Queue::ConstIterator ns3::WifiMacQueue::Remove(ns3::Queue::ConstIterator pos, bool removeExpired=false) [member function] - cls.add_method('Remove', - 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator', - [param('std::list< ns3::Ptr< ns3::WifiMacQueueItem > > const_iterator', 'pos'), param('bool', 'removeExpired', default_value='false')]) + 'ns3::Ptr< ns3::WifiMacQueueItem const >', + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item'), param('bool', 'removeExpired', default_value='false')]) + ## wifi-mac-queue.h (module 'wifi'): void ns3::WifiMacQueue::Replace(ns3::Ptr currentItem, ns3::Ptr newItem) [member function] + cls.add_method('Replace', + 'void', + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'currentItem'), param('ns3::Ptr< ns3::WifiMacQueueItem >', 'newItem')]) ## wifi-mac-queue.h (module 'wifi'): uint32_t ns3::WifiMacQueue::GetNPacketsByAddress(ns3::Mac48Address dest) [member function] cls.add_method('GetNPacketsByAddress', 'uint32_t', @@ -23351,12 +23343,10 @@ def register_Ns3WifiMacQueue_methods(root_module, cls): cls.add_method('GetNBytes', 'uint32_t', []) - ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::TtlExceeded(ns3::Queue::ConstIterator & it, ns3::Time const & now) [member function] + ## wifi-mac-queue.h (module 'wifi'): bool ns3::WifiMacQueue::TtlExceeded(ns3::Ptr item, ns3::Time const & now) [member function] cls.add_method('TtlExceeded', 'bool', - [param('ns3::Queue< ns3::WifiMacQueueItem > ConstIterator &', 'it'), param('ns3::Time const &', 'now')]) - ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::EMPTY [variable] - cls.add_static_attribute('EMPTY', 'ns3::Queue< ns3::WifiMacQueueItem > ConstIterator const', is_const=True) + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item'), param('ns3::Time const &', 'now')]) ## wifi-mac-queue.h (module 'wifi'): ns3::WifiMacQueue::WifiMacQueue(ns3::WifiMacQueue const & arg0) [constructor] cls.add_constructor([param('ns3::WifiMacQueue const &', 'arg0')]) return