From 00161ead2ab9c1e678ed7351aa46524791a8917b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Wed, 11 Apr 2018 08:14:13 +0200 Subject: [PATCH] wifi: Use forward declaration as often as possible (part 6) --- src/wave/bindings/modulegen__gcc_ILP32.py | 212 ---------------------- src/wave/bindings/modulegen__gcc_LP64.py | 212 ---------------------- src/wifi/model/ap-wifi-mac.cc | 1 + src/wifi/model/dca-txop.cc | 1 + src/wifi/model/edca-txop-n.cc | 5 +- src/wifi/model/mac-low.cc | 3 + src/wifi/model/mac-low.h | 8 +- src/wifi/model/mac-tx-middle.h | 2 +- src/wifi/test/wifi-aggregation-test.cc | 1 + 9 files changed, 14 insertions(+), 431 deletions(-) diff --git a/src/wave/bindings/modulegen__gcc_ILP32.py b/src/wave/bindings/modulegen__gcc_ILP32.py index 40d870723..0a0edfd30 100644 --- a/src/wave/bindings/modulegen__gcc_ILP32.py +++ b/src/wave/bindings/modulegen__gcc_ILP32.py @@ -444,10 +444,6 @@ def register_types(module): module.add_class('ZetaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable [class] module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader [class] - module.add_class('AmpduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header']) - ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader [class] - module.add_class('AmsduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header']) ## application.h (module 'network'): ns3::Application [class] module.add_class('Application', import_from_module='ns.network', parent=root_module['ns3::Object']) ## attribute.h (module 'core'): ns3::AttributeAccessor [class] @@ -572,10 +568,6 @@ def register_types(module): module.add_class('MacLow', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class] module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object']) - ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator [class] - module.add_class('MpduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object']) - ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator [class] - module.add_class('MsduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice [class] module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration] @@ -738,10 +730,6 @@ def register_types(module): module.add_container('std::vector< unsigned char >', 'unsigned char', container_type=u'vector') module.add_container('std::map< ns3::Mac48Address, bool >', ('ns3::Mac48Address', 'bool'), container_type=u'map') module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type=u'map') - module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') - module.add_container('ns3::MpduAggregator::DeaggregatedMpdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') - module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') - module.add_container('ns3::MsduAggregator::DeaggregatedMsdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') module.add_container('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map') module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::RxOkCallback') @@ -1048,8 +1036,6 @@ def register_methods(root_module): register_Ns3YansWavePhyHelper_methods(root_module, root_module['ns3::YansWavePhyHelper']) register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable']) register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable']) - register_Ns3AmpduSubframeHeader_methods(root_module, root_module['ns3::AmpduSubframeHeader']) - register_Ns3AmsduSubframeHeader_methods(root_module, root_module['ns3::AmsduSubframeHeader']) register_Ns3Application_methods(root_module, root_module['ns3::Application']) register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor']) register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker']) @@ -1110,8 +1096,6 @@ def register_methods(root_module): register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) register_Ns3MacLow_methods(root_module, root_module['ns3::MacLow']) register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel']) - register_Ns3MpduAggregator_methods(root_module, root_module['ns3::MpduAggregator']) - register_Ns3MsduAggregator_methods(root_module, root_module['ns3::MsduAggregator']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) @@ -10355,125 +10339,6 @@ def register_Ns3ZipfRandomVariable_methods(root_module, cls): is_virtual=True) return -def register_Ns3AmpduSubframeHeader_methods(root_module, cls): - ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader::AmpduSubframeHeader(ns3::AmpduSubframeHeader const & arg0) [constructor] - cls.add_constructor([param('ns3::AmpduSubframeHeader const &', 'arg0')]) - ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader::AmpduSubframeHeader() [constructor] - cls.add_constructor([]) - ## ampdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmpduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function] - cls.add_method('Deserialize', - 'uint32_t', - [param('ns3::Buffer::Iterator', 'start')], - is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): bool ns3::AmpduSubframeHeader::GetEof() const [member function] - cls.add_method('GetEof', - 'bool', - [], - is_const=True) - ## ampdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmpduSubframeHeader::GetInstanceTypeId() const [member function] - cls.add_method('GetInstanceTypeId', - 'ns3::TypeId', - [], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmpduSubframeHeader::GetLength() const [member function] - cls.add_method('GetLength', - 'uint16_t', - [], - is_const=True) - ## ampdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmpduSubframeHeader::GetSerializedSize() const [member function] - cls.add_method('GetSerializedSize', - 'uint32_t', - [], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmpduSubframeHeader::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::Print(std::ostream & os) const [member function] - cls.add_method('Print', - 'void', - [param('std::ostream &', 'os')], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function] - cls.add_method('Serialize', - 'void', - [param('ns3::Buffer::Iterator', 'start')], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::SetEof(bool eof) [member function] - cls.add_method('SetEof', - 'void', - [param('bool', 'eof')]) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::SetLength(uint16_t length) [member function] - cls.add_method('SetLength', - 'void', - [param('uint16_t', 'length')]) - return - -def register_Ns3AmsduSubframeHeader_methods(root_module, cls): - ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader(ns3::AmsduSubframeHeader const & arg0) [constructor] - cls.add_constructor([param('ns3::AmsduSubframeHeader const &', 'arg0')]) - ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader() [constructor] - cls.add_constructor([]) - ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function] - cls.add_method('Deserialize', - 'uint32_t', - [param('ns3::Buffer::Iterator', 'start')], - is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetDestinationAddr() const [member function] - cls.add_method('GetDestinationAddr', - 'ns3::Mac48Address', - [], - is_const=True) - ## amsdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmsduSubframeHeader::GetInstanceTypeId() const [member function] - cls.add_method('GetInstanceTypeId', - 'ns3::TypeId', - [], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmsduSubframeHeader::GetLength() const [member function] - cls.add_method('GetLength', - 'uint16_t', - [], - is_const=True) - ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::GetSerializedSize() const [member function] - cls.add_method('GetSerializedSize', - 'uint32_t', - [], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetSourceAddr() const [member function] - cls.add_method('GetSourceAddr', - 'ns3::Mac48Address', - [], - is_const=True) - ## amsdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmsduSubframeHeader::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Print(std::ostream & os) const [member function] - cls.add_method('Print', - 'void', - [param('std::ostream &', 'os')], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function] - cls.add_method('Serialize', - 'void', - [param('ns3::Buffer::Iterator', 'start')], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetDestinationAddr(ns3::Mac48Address to) [member function] - cls.add_method('SetDestinationAddr', - 'void', - [param('ns3::Mac48Address', 'to')]) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetLength(uint16_t length) [member function] - cls.add_method('SetLength', - 'void', - [param('uint16_t', 'length')]) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetSourceAddr(ns3::Mac48Address to) [member function] - cls.add_method('SetSourceAddr', - 'void', - [param('ns3::Mac48Address', 'to')]) - return - def register_Ns3Application_methods(root_module, cls): ## application.h (module 'network'): ns3::Application::Application(ns3::Application const & arg0) [constructor] cls.add_constructor([param('ns3::Application const &', 'arg0')]) @@ -14468,83 +14333,6 @@ def register_Ns3MobilityModel_methods(root_module, cls): is_pure_virtual=True, visibility='private', is_virtual=True) return -def register_Ns3MpduAggregator_methods(root_module, cls): - ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator::MpduAggregator(ns3::MpduAggregator const & arg0) [constructor] - cls.add_constructor([param('ns3::MpduAggregator const &', 'arg0')]) - ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator::MpduAggregator() [constructor] - cls.add_constructor([]) - ## mpdu-aggregator.h (module 'wifi'): void ns3::MpduAggregator::AddHeaderAndPad(ns3::Ptr packet, bool last, bool isSingleMpdu) const [member function] - cls.add_method('AddHeaderAndPad', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('bool', 'last'), param('bool', 'isSingleMpdu')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): bool ns3::MpduAggregator::Aggregate(ns3::Ptr packet, ns3::Ptr aggregatedPacket) const [member function] - cls.add_method('Aggregate', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): void ns3::MpduAggregator::AggregateSingleMpdu(ns3::Ptr packet, ns3::Ptr aggregatedPacket) const [member function] - cls.add_method('AggregateSingleMpdu', - 'void', - [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): bool ns3::MpduAggregator::CanBeAggregated(uint32_t packetSize, ns3::Ptr aggregatedPacket, uint8_t blockAckSize) const [member function] - cls.add_method('CanBeAggregated', - 'bool', - [param('uint32_t', 'packetSize'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint8_t', 'blockAckSize')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): static ns3::MpduAggregator::DeaggregatedMpdus ns3::MpduAggregator::Deaggregate(ns3::Ptr aggregatedPacket) [member function] - cls.add_method('Deaggregate', - 'ns3::MpduAggregator::DeaggregatedMpdus', - [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_static=True) - ## mpdu-aggregator.h (module 'wifi'): uint16_t ns3::MpduAggregator::GetMaxAmpduSize() const [member function] - cls.add_method('GetMaxAmpduSize', - 'uint16_t', - [], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MpduAggregator::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## mpdu-aggregator.h (module 'wifi'): void ns3::MpduAggregator::SetMaxAmpduSize(uint16_t maxSize) [member function] - cls.add_method('SetMaxAmpduSize', - 'void', - [param('uint16_t', 'maxSize')]) - return - -def register_Ns3MsduAggregator_methods(root_module, cls): - ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator(ns3::MsduAggregator const & arg0) [constructor] - cls.add_constructor([param('ns3::MsduAggregator const &', 'arg0')]) - ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator() [constructor] - cls.add_constructor([]) - ## msdu-aggregator.h (module 'wifi'): bool ns3::MsduAggregator::Aggregate(ns3::Ptr packet, ns3::Ptr aggregatedPacket, ns3::Mac48Address src, ns3::Mac48Address dest) const [member function] - cls.add_method('Aggregate', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dest')], - is_const=True) - ## msdu-aggregator.h (module 'wifi'): static ns3::MsduAggregator::DeaggregatedMsdus ns3::MsduAggregator::Deaggregate(ns3::Ptr aggregatedPacket) [member function] - cls.add_method('Deaggregate', - 'ns3::MsduAggregator::DeaggregatedMsdus', - [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_static=True) - ## msdu-aggregator.h (module 'wifi'): uint16_t ns3::MsduAggregator::GetMaxAmsduSize() const [member function] - cls.add_method('GetMaxAmsduSize', - 'uint16_t', - [], - is_const=True) - ## msdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MsduAggregator::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## msdu-aggregator.h (module 'wifi'): void ns3::MsduAggregator::SetMaxAmsduSize(uint16_t maxSize) [member function] - cls.add_method('SetMaxAmsduSize', - 'void', - [param('uint16_t', 'maxSize')]) - return - def register_Ns3NetDevice_methods(root_module, cls): ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor] cls.add_constructor([]) diff --git a/src/wave/bindings/modulegen__gcc_LP64.py b/src/wave/bindings/modulegen__gcc_LP64.py index 40d870723..0a0edfd30 100644 --- a/src/wave/bindings/modulegen__gcc_LP64.py +++ b/src/wave/bindings/modulegen__gcc_LP64.py @@ -444,10 +444,6 @@ def register_types(module): module.add_class('ZetaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable [class] module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader [class] - module.add_class('AmpduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header']) - ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader [class] - module.add_class('AmsduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header']) ## application.h (module 'network'): ns3::Application [class] module.add_class('Application', import_from_module='ns.network', parent=root_module['ns3::Object']) ## attribute.h (module 'core'): ns3::AttributeAccessor [class] @@ -572,10 +568,6 @@ def register_types(module): module.add_class('MacLow', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class] module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object']) - ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator [class] - module.add_class('MpduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object']) - ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator [class] - module.add_class('MsduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice [class] module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration] @@ -738,10 +730,6 @@ def register_types(module): module.add_container('std::vector< unsigned char >', 'unsigned char', container_type=u'vector') module.add_container('std::map< ns3::Mac48Address, bool >', ('ns3::Mac48Address', 'bool'), container_type=u'map') module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type=u'map') - module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') - module.add_container('ns3::MpduAggregator::DeaggregatedMpdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') - module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') - module.add_container('ns3::MsduAggregator::DeaggregatedMsdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') module.add_container('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map') module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::RxOkCallback') @@ -1048,8 +1036,6 @@ def register_methods(root_module): register_Ns3YansWavePhyHelper_methods(root_module, root_module['ns3::YansWavePhyHelper']) register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable']) register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable']) - register_Ns3AmpduSubframeHeader_methods(root_module, root_module['ns3::AmpduSubframeHeader']) - register_Ns3AmsduSubframeHeader_methods(root_module, root_module['ns3::AmsduSubframeHeader']) register_Ns3Application_methods(root_module, root_module['ns3::Application']) register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor']) register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker']) @@ -1110,8 +1096,6 @@ def register_methods(root_module): register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) register_Ns3MacLow_methods(root_module, root_module['ns3::MacLow']) register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel']) - register_Ns3MpduAggregator_methods(root_module, root_module['ns3::MpduAggregator']) - register_Ns3MsduAggregator_methods(root_module, root_module['ns3::MsduAggregator']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) @@ -10355,125 +10339,6 @@ def register_Ns3ZipfRandomVariable_methods(root_module, cls): is_virtual=True) return -def register_Ns3AmpduSubframeHeader_methods(root_module, cls): - ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader::AmpduSubframeHeader(ns3::AmpduSubframeHeader const & arg0) [constructor] - cls.add_constructor([param('ns3::AmpduSubframeHeader const &', 'arg0')]) - ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader::AmpduSubframeHeader() [constructor] - cls.add_constructor([]) - ## ampdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmpduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function] - cls.add_method('Deserialize', - 'uint32_t', - [param('ns3::Buffer::Iterator', 'start')], - is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): bool ns3::AmpduSubframeHeader::GetEof() const [member function] - cls.add_method('GetEof', - 'bool', - [], - is_const=True) - ## ampdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmpduSubframeHeader::GetInstanceTypeId() const [member function] - cls.add_method('GetInstanceTypeId', - 'ns3::TypeId', - [], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmpduSubframeHeader::GetLength() const [member function] - cls.add_method('GetLength', - 'uint16_t', - [], - is_const=True) - ## ampdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmpduSubframeHeader::GetSerializedSize() const [member function] - cls.add_method('GetSerializedSize', - 'uint32_t', - [], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmpduSubframeHeader::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::Print(std::ostream & os) const [member function] - cls.add_method('Print', - 'void', - [param('std::ostream &', 'os')], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function] - cls.add_method('Serialize', - 'void', - [param('ns3::Buffer::Iterator', 'start')], - is_const=True, is_virtual=True) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::SetEof(bool eof) [member function] - cls.add_method('SetEof', - 'void', - [param('bool', 'eof')]) - ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::SetLength(uint16_t length) [member function] - cls.add_method('SetLength', - 'void', - [param('uint16_t', 'length')]) - return - -def register_Ns3AmsduSubframeHeader_methods(root_module, cls): - ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader(ns3::AmsduSubframeHeader const & arg0) [constructor] - cls.add_constructor([param('ns3::AmsduSubframeHeader const &', 'arg0')]) - ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader() [constructor] - cls.add_constructor([]) - ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function] - cls.add_method('Deserialize', - 'uint32_t', - [param('ns3::Buffer::Iterator', 'start')], - is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetDestinationAddr() const [member function] - cls.add_method('GetDestinationAddr', - 'ns3::Mac48Address', - [], - is_const=True) - ## amsdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmsduSubframeHeader::GetInstanceTypeId() const [member function] - cls.add_method('GetInstanceTypeId', - 'ns3::TypeId', - [], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmsduSubframeHeader::GetLength() const [member function] - cls.add_method('GetLength', - 'uint16_t', - [], - is_const=True) - ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::GetSerializedSize() const [member function] - cls.add_method('GetSerializedSize', - 'uint32_t', - [], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetSourceAddr() const [member function] - cls.add_method('GetSourceAddr', - 'ns3::Mac48Address', - [], - is_const=True) - ## amsdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmsduSubframeHeader::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Print(std::ostream & os) const [member function] - cls.add_method('Print', - 'void', - [param('std::ostream &', 'os')], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function] - cls.add_method('Serialize', - 'void', - [param('ns3::Buffer::Iterator', 'start')], - is_const=True, is_virtual=True) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetDestinationAddr(ns3::Mac48Address to) [member function] - cls.add_method('SetDestinationAddr', - 'void', - [param('ns3::Mac48Address', 'to')]) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetLength(uint16_t length) [member function] - cls.add_method('SetLength', - 'void', - [param('uint16_t', 'length')]) - ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetSourceAddr(ns3::Mac48Address to) [member function] - cls.add_method('SetSourceAddr', - 'void', - [param('ns3::Mac48Address', 'to')]) - return - def register_Ns3Application_methods(root_module, cls): ## application.h (module 'network'): ns3::Application::Application(ns3::Application const & arg0) [constructor] cls.add_constructor([param('ns3::Application const &', 'arg0')]) @@ -14468,83 +14333,6 @@ def register_Ns3MobilityModel_methods(root_module, cls): is_pure_virtual=True, visibility='private', is_virtual=True) return -def register_Ns3MpduAggregator_methods(root_module, cls): - ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator::MpduAggregator(ns3::MpduAggregator const & arg0) [constructor] - cls.add_constructor([param('ns3::MpduAggregator const &', 'arg0')]) - ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator::MpduAggregator() [constructor] - cls.add_constructor([]) - ## mpdu-aggregator.h (module 'wifi'): void ns3::MpduAggregator::AddHeaderAndPad(ns3::Ptr packet, bool last, bool isSingleMpdu) const [member function] - cls.add_method('AddHeaderAndPad', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('bool', 'last'), param('bool', 'isSingleMpdu')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): bool ns3::MpduAggregator::Aggregate(ns3::Ptr packet, ns3::Ptr aggregatedPacket) const [member function] - cls.add_method('Aggregate', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): void ns3::MpduAggregator::AggregateSingleMpdu(ns3::Ptr packet, ns3::Ptr aggregatedPacket) const [member function] - cls.add_method('AggregateSingleMpdu', - 'void', - [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): bool ns3::MpduAggregator::CanBeAggregated(uint32_t packetSize, ns3::Ptr aggregatedPacket, uint8_t blockAckSize) const [member function] - cls.add_method('CanBeAggregated', - 'bool', - [param('uint32_t', 'packetSize'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint8_t', 'blockAckSize')], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): static ns3::MpduAggregator::DeaggregatedMpdus ns3::MpduAggregator::Deaggregate(ns3::Ptr aggregatedPacket) [member function] - cls.add_method('Deaggregate', - 'ns3::MpduAggregator::DeaggregatedMpdus', - [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_static=True) - ## mpdu-aggregator.h (module 'wifi'): uint16_t ns3::MpduAggregator::GetMaxAmpduSize() const [member function] - cls.add_method('GetMaxAmpduSize', - 'uint16_t', - [], - is_const=True) - ## mpdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MpduAggregator::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## mpdu-aggregator.h (module 'wifi'): void ns3::MpduAggregator::SetMaxAmpduSize(uint16_t maxSize) [member function] - cls.add_method('SetMaxAmpduSize', - 'void', - [param('uint16_t', 'maxSize')]) - return - -def register_Ns3MsduAggregator_methods(root_module, cls): - ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator(ns3::MsduAggregator const & arg0) [constructor] - cls.add_constructor([param('ns3::MsduAggregator const &', 'arg0')]) - ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator() [constructor] - cls.add_constructor([]) - ## msdu-aggregator.h (module 'wifi'): bool ns3::MsduAggregator::Aggregate(ns3::Ptr packet, ns3::Ptr aggregatedPacket, ns3::Mac48Address src, ns3::Mac48Address dest) const [member function] - cls.add_method('Aggregate', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dest')], - is_const=True) - ## msdu-aggregator.h (module 'wifi'): static ns3::MsduAggregator::DeaggregatedMsdus ns3::MsduAggregator::Deaggregate(ns3::Ptr aggregatedPacket) [member function] - cls.add_method('Deaggregate', - 'ns3::MsduAggregator::DeaggregatedMsdus', - [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], - is_static=True) - ## msdu-aggregator.h (module 'wifi'): uint16_t ns3::MsduAggregator::GetMaxAmsduSize() const [member function] - cls.add_method('GetMaxAmsduSize', - 'uint16_t', - [], - is_const=True) - ## msdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MsduAggregator::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## msdu-aggregator.h (module 'wifi'): void ns3::MsduAggregator::SetMaxAmsduSize(uint16_t maxSize) [member function] - cls.add_method('SetMaxAmsduSize', - 'void', - [param('uint16_t', 'maxSize')]) - return - def register_Ns3NetDevice_methods(root_module, cls): ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor] cls.add_constructor([]) diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 49e05b4de..07fd6fed4 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -36,6 +36,7 @@ #include "vht-operation.h" #include "he-operation.h" #include "mgt-headers.h" +#include "msdu-aggregator.h" namespace ns3 { diff --git a/src/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc index 51c5966bb..912804fdd 100644 --- a/src/wifi/model/dca-txop.cc +++ b/src/wifi/model/dca-txop.cc @@ -26,6 +26,7 @@ #include "wifi-mac-queue.h" #include "mac-tx-middle.h" #include "mac-low.h" +#include "wifi-remote-station-manager.h" #undef NS_LOG_APPEND_CONTEXT #define NS_LOG_APPEND_CONTEXT if (m_low != 0) { std::clog << "[mac=" << m_low->GetAddress () << "] "; } diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 19c2500b4..299702bc4 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -22,6 +22,7 @@ #include "ns3/log.h" #include "ns3/pointer.h" +#include "ns3/simulator.h" #include "edca-txop-n.h" #include "dcf-manager.h" #include "dcf-state.h" @@ -31,7 +32,9 @@ #include "wifi-mac-queue.h" #include "mac-low.h" #include "qos-blocked-destinations.h" -#include "ns3/simulator.h" +#include "wifi-remote-station-manager.h" +#include "msdu-aggregator.h" +#include "mpdu-aggregator.h" #undef NS_LOG_APPEND_CONTEXT #define NS_LOG_APPEND_CONTEXT if (m_low != 0) { std::clog << "[mac=" << m_low->GetAddress () << "] "; } diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index 97b756223..6f96fb94e 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -30,6 +30,9 @@ #include "wifi-mac-queue.h" #include "wifi-utils.h" #include "mgt-headers.h" +#include "wifi-remote-station-manager.h" +#include "mpdu-aggregator.h" +#include "msdu-aggregator.h" #undef NS_LOG_APPEND_CONTEXT #define NS_LOG_APPEND_CONTEXT std::clog << "[mac=" << m_self << "] " diff --git a/src/wifi/model/mac-low.h b/src/wifi/model/mac-low.h index ee6382800..81cdf00f0 100644 --- a/src/wifi/model/mac-low.h +++ b/src/wifi/model/mac-low.h @@ -25,11 +25,7 @@ #include "wifi-phy.h" #include "dcf-manager.h" -#include "wifi-remote-station-manager.h" -#include "block-ack-agreement.h" #include "block-ack-cache.h" -#include "mpdu-aggregator.h" -#include "msdu-aggregator.h" #include "mac-low-transmission-parameters.h" #include "qos-utils.h" #include "wifi-mac-header.h" @@ -39,12 +35,14 @@ class AmpduAggregationTest; namespace ns3 { +class WifiPhy; class DcaTxop; class EdcaTxopN; -class DcfManager; class WifiMacQueueItem; class WifiMacQueue; +class BlockAckAgreement; class MgtAddBaResponseHeader; +class WifiRemoteStationManager; /** * \ingroup wifi diff --git a/src/wifi/model/mac-tx-middle.h b/src/wifi/model/mac-tx-middle.h index 1056084d8..f9c8459cd 100644 --- a/src/wifi/model/mac-tx-middle.h +++ b/src/wifi/model/mac-tx-middle.h @@ -24,12 +24,12 @@ #define MAC_TX_MIDDLE_H #include -#include "ns3/mac48-address.h" #include "ns3/simple-ref-count.h" namespace ns3 { class WifiMacHeader; +class Mac48Address; /** * \ingroup wifi diff --git a/src/wifi/test/wifi-aggregation-test.cc b/src/wifi/test/wifi-aggregation-test.cc index b529e6b0d..f48495c25 100644 --- a/src/wifi/test/wifi-aggregation-test.cc +++ b/src/wifi/test/wifi-aggregation-test.cc @@ -30,6 +30,7 @@ #include "ns3/msdu-aggregator.h" #include "ns3/mpdu-aggregator.h" #include "ns3/mgt-headers.h" +#include "ns3/wifi-remote-station-manager.h" using namespace ns3;