diff --git a/bindings/python/ns3_module_common.py b/bindings/python/ns3_module_common.py index 2b9ad84e3..b6a44c031 100644 --- a/bindings/python/ns3_module_common.py +++ b/bindings/python/ns3_module_common.py @@ -609,10 +609,10 @@ def register_Ns3BufferIterator_methods(root_module, cls): return def register_Ns3Chunk_methods(root_module, cls): - ## chunk.h: ns3::Chunk::Chunk() [constructor] - cls.add_constructor([]) ## chunk.h: ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor] cls.add_constructor([param('ns3::Chunk&', 'arg0', is_const=True)]) + ## chunk.h: ns3::Chunk::Chunk() [constructor] + cls.add_constructor([]) ## chunk.h: static ns3::TypeId ns3::Chunk::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index 2e27dd214..c2ebbafaa 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -3,6 +3,8 @@ from pybindgen import Module, FileCodeSink, param, retval, cppclass def register_types(module): root_module = module.get_root() + ## log.h: ns3::LogLevel [enumeration] + module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME']) ## random-variable.h: ns3::RandomVariable [class] module.add_class('RandomVariable') ## random-variable.h: ns3::TriangularVariable [class] @@ -117,6 +119,8 @@ def register_types(module): module.add_class('TracedCallback', template_parameters=['unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty']) ## random-variable.h: ns3::DeterministicVariable [class] module.add_class('DeterministicVariable', parent=root_module['ns3::RandomVariable']) + ## log.h: ns3::LogComponent [class] + module.add_class('LogComponent') ## attribute-list.h: ns3::AttributeList [class] module.add_class('AttributeList') ## attribute.h: ns3::AttributeValue [class] @@ -268,6 +272,7 @@ def register_methods(root_module): register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, double, ns3::WifiMode, ns3::WifiPreamble >']) register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< unsigned int, unsigned int, ns3::empty, ns3::empty >']) register_Ns3DeterministicVariable_methods(root_module, root_module['ns3::DeterministicVariable']) + register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent']) register_Ns3AttributeList_methods(root_module, root_module['ns3::AttributeList']) register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue']) register_Ns3UniformVariable_methods(root_module, root_module['ns3::UniformVariable']) @@ -887,10 +892,10 @@ def register_Ns3Empty_methods(root_module, cls): return def register_Ns3ObjectBase_methods(root_module, cls): - ## object-base.h: ns3::ObjectBase::ObjectBase() [constructor] - cls.add_constructor([]) ## object-base.h: ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor] cls.add_constructor([param('ns3::ObjectBase&', 'arg0', is_const=True)]) + ## object-base.h: ns3::ObjectBase::ObjectBase() [constructor] + cls.add_constructor([]) ## object-base.h: static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -1327,6 +1332,38 @@ def register_Ns3DeterministicVariable_methods(root_module, cls): cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')]) return +def register_Ns3LogComponent_methods(root_module, cls): + ## log.h: ns3::LogComponent::LogComponent(char const * name) [constructor] + cls.add_constructor([param('char *', 'name', transfer_ownership=False, is_const=True)]) + ## log.h: void ns3::LogComponent::EnvVarCheck(char const * name) [member function] + cls.add_method('EnvVarCheck', + 'void', + [param('char *', 'name', transfer_ownership=False, is_const=True)]) + ## log.h: bool ns3::LogComponent::IsEnabled(ns3::LogLevel level) const [member function] + cls.add_method('IsEnabled', + 'bool', + [param('ns3::LogLevel', 'level')], + is_const=True) + ## log.h: bool ns3::LogComponent::IsNoneEnabled() const [member function] + cls.add_method('IsNoneEnabled', + 'bool', + [], + is_const=True) + ## log.h: void ns3::LogComponent::Enable(ns3::LogLevel level) [member function] + cls.add_method('Enable', + 'void', + [param('ns3::LogLevel', 'level')]) + ## log.h: void ns3::LogComponent::Disable(ns3::LogLevel level) [member function] + cls.add_method('Disable', + 'void', + [param('ns3::LogLevel', 'level')]) + ## log.h: char const * ns3::LogComponent::Name() const [member function] + cls.add_method('Name', + retval('char *', is_const=True, caller_owns_return=False), + [], + is_const=True) + return + def register_Ns3AttributeList_methods(root_module, cls): ## attribute-list.h: ns3::AttributeList::AttributeList() [constructor] cls.add_constructor([]) @@ -2031,6 +2068,10 @@ def register_functions(root_module): module.add_function('MakeEnumChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [param('int', 'v1'), param('std::string', 'n1'), param('int', 'v2', default_value='0'), param('std::string', 'n2', default_value='""'), param('int', 'v3', default_value='0'), param('std::string', 'n3', default_value='""'), param('int', 'v4', default_value='0'), param('std::string', 'n4', default_value='""'), param('int', 'v5', default_value='0'), param('std::string', 'n5', default_value='""'), param('int', 'v6', default_value='0'), param('std::string', 'n6', default_value='""'), param('int', 'v7', default_value='0'), param('std::string', 'n7', default_value='""'), param('int', 'v8', default_value='0'), param('std::string', 'n8', default_value='""'), param('int', 'v9', default_value='0'), param('std::string', 'n9', default_value='""'), param('int', 'v10', default_value='0'), param('std::string', 'n10', default_value='""'), param('int', 'v11', default_value='0'), param('std::string', 'n11', default_value='""'), param('int', 'v12', default_value='0'), param('std::string', 'n12', default_value='""')]) + ## log.h: extern void ns3::LogComponentEnableAll(ns3::LogLevel level) [free function] + module.add_function('LogComponentEnableAll', + 'void', + [param('ns3::LogLevel', 'level')]) ## type-id.h: extern ns3::Ptr ns3::MakeTypeIdChecker() [free function] module.add_function('MakeTypeIdChecker', 'ns3::Ptr< ns3::AttributeChecker const >', @@ -2049,6 +2090,14 @@ def register_functions(root_module): module.add_function('MakeObjectFactoryChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) + ## log.h: extern ns3::LogTimePrinter ns3::LogGetTimePrinter() [free function] + module.add_function('LogGetTimePrinter', + 'ns3::LogTimePrinter *', + []) + ## log.h: extern void ns3::LogComponentDisableAll(ns3::LogLevel level) [free function] + module.add_function('LogComponentDisableAll', + 'void', + [param('ns3::LogLevel', 'level')]) ## breakpoint.h: extern void ns3::BreakpointFallback() [free function] module.add_function('BreakpointFallback', 'void', @@ -2057,6 +2106,22 @@ def register_functions(root_module): module.add_function('MakeRandomVariableChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) + ## log.h: extern void ns3::LogSetTimePrinter(ns3::LogTimePrinter arg0) [free function] + module.add_function('LogSetTimePrinter', + 'void', + [param('ns3::LogTimePrinter *', 'arg0')]) + ## log.h: extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function] + module.add_function('LogComponentDisable', + 'void', + [param('char *', 'name', transfer_ownership=False, is_const=True), param('ns3::LogLevel', 'level')]) + ## log.h: extern void ns3::LogComponentEnable(char const * name, ns3::LogLevel level) [free function] + module.add_function('LogComponentEnable', + 'void', + [param('char *', 'name', transfer_ownership=False, is_const=True), param('ns3::LogLevel', 'level')]) + ## log.h: extern void ns3::LogComponentPrintList() [free function] + module.add_function('LogComponentPrintList', + 'void', + []) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) diff --git a/bindings/python/ns3_module_node.py b/bindings/python/ns3_module_node.py index 2bfdbe97a..5d3741594 100644 --- a/bindings/python/ns3_module_node.py +++ b/bindings/python/ns3_module_node.py @@ -73,6 +73,8 @@ def register_types(module): module.add_class('NetDevice', parent=root_module['ns3::Object']) ## net-device.h: ns3::NetDevice::PacketType [enumeration] module.add_enum('PacketType', ['PACKET_HOST', 'PACKET_BROADCAST', 'PACKET_MULTICAST', 'PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice']) + ## drop-tail-queue.h: ns3::DropTailQueue [class] + module.add_class('DropTailQueue', parent=root_module['ns3::Queue']) ## address.h: ns3::AddressValue [class] module.add_class('AddressValue', parent=root_module['ns3::AttributeValue']) ## node.h: ns3::Node [class] @@ -89,18 +91,16 @@ def register_types(module): module.add_class('Ipv4', parent=root_module['ns3::Object']) ## socket-factory.h: ns3::SocketFactory [class] module.add_class('SocketFactory', parent=root_module['ns3::Object']) - ## drop-tail-queue.h: ns3::DropTailQueue [class] - module.add_class('DropTailQueue', parent=root_module['ns3::Queue']) ## ethernet-trailer.h: ns3::EthernetTrailer [class] module.add_class('EthernetTrailer', parent=root_module['ns3::Trailer']) + ## simple-channel.h: ns3::SimpleChannel [class] + module.add_class('SimpleChannel', parent=root_module['ns3::Channel']) ## llc-snap-header.h: ns3::LlcSnapHeader [class] module.add_class('LlcSnapHeader', parent=root_module['ns3::Header']) ## udp-socket-factory.h: ns3::UdpSocketFactory [class] module.add_class('UdpSocketFactory', parent=root_module['ns3::SocketFactory']) ## simple-net-device.h: ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice']) - ## simple-channel.h: ns3::SimpleChannel [class] - module.add_class('SimpleChannel', parent=root_module['ns3::Channel']) ## tcp-socket-factory.h: ns3::TcpSocketFactory [class] module.add_class('TcpSocketFactory', parent=root_module['ns3::SocketFactory']) ## packet-socket-factory.h: ns3::PacketSocketFactory [class] @@ -173,6 +173,7 @@ def register_methods(root_module): register_Ns3Ipv4Header_methods(root_module, root_module['ns3::Ipv4Header']) register_Ns3UdpSocket_methods(root_module, root_module['ns3::UdpSocket']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) + register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue']) register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) register_Ns3Channel_methods(root_module, root_module['ns3::Channel']) @@ -181,12 +182,11 @@ def register_methods(root_module): register_Ns3SocketIpTtlTag_methods(root_module, root_module['ns3::SocketIpTtlTag']) register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4']) register_Ns3SocketFactory_methods(root_module, root_module['ns3::SocketFactory']) - register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue']) register_Ns3EthernetTrailer_methods(root_module, root_module['ns3::EthernetTrailer']) + register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3LlcSnapHeader_methods(root_module, root_module['ns3::LlcSnapHeader']) register_Ns3UdpSocketFactory_methods(root_module, root_module['ns3::UdpSocketFactory']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) - register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3TcpSocketFactory_methods(root_module, root_module['ns3::TcpSocketFactory']) register_Ns3PacketSocketFactory_methods(root_module, root_module['ns3::PacketSocketFactory']) return @@ -1572,6 +1572,31 @@ def register_Ns3NetDevice_methods(root_module, cls): cls.add_constructor([]) return +def register_Ns3DropTailQueue_methods(root_module, cls): + ## drop-tail-queue.h: static ns3::TypeId ns3::DropTailQueue::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## drop-tail-queue.h: ns3::DropTailQueue::DropTailQueue() [constructor] + cls.add_constructor([]) + ## drop-tail-queue.h: bool ns3::DropTailQueue::DoEnqueue(ns3::Ptr p) [member function] + cls.add_method('DoEnqueue', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## drop-tail-queue.h: ns3::Ptr ns3::DropTailQueue::DoDequeue() [member function] + cls.add_method('DoDequeue', + 'ns3::Ptr< ns3::Packet >', + [], + visibility='private', is_virtual=True) + ## drop-tail-queue.h: ns3::Ptr ns3::DropTailQueue::DoPeek() const [member function] + cls.add_method('DoPeek', + 'ns3::Ptr< ns3::Packet >', + [], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3AddressValue_methods(root_module, cls): ## address.h: ns3::AddressValue::AddressValue() [constructor] cls.add_constructor([]) @@ -2147,31 +2172,6 @@ def register_Ns3SocketFactory_methods(root_module, cls): is_pure_virtual=True, is_virtual=True) return -def register_Ns3DropTailQueue_methods(root_module, cls): - ## drop-tail-queue.h: static ns3::TypeId ns3::DropTailQueue::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## drop-tail-queue.h: ns3::DropTailQueue::DropTailQueue() [constructor] - cls.add_constructor([]) - ## drop-tail-queue.h: bool ns3::DropTailQueue::DoEnqueue(ns3::Ptr p) [member function] - cls.add_method('DoEnqueue', - 'bool', - [param('ns3::Ptr< ns3::Packet >', 'p')], - visibility='private', is_virtual=True) - ## drop-tail-queue.h: ns3::Ptr ns3::DropTailQueue::DoDequeue() [member function] - cls.add_method('DoDequeue', - 'ns3::Ptr< ns3::Packet >', - [], - visibility='private', is_virtual=True) - ## drop-tail-queue.h: ns3::Ptr ns3::DropTailQueue::DoPeek() const [member function] - cls.add_method('DoPeek', - 'ns3::Ptr< ns3::Packet >', - [], - is_const=True, visibility='private', is_virtual=True) - return - def register_Ns3EthernetTrailer_methods(root_module, cls): ## ethernet-trailer.h: ns3::EthernetTrailer::EthernetTrailer() [constructor] cls.add_constructor([]) @@ -2234,6 +2234,34 @@ def register_Ns3EthernetTrailer_methods(root_module, cls): is_virtual=True) return +def register_Ns3SimpleChannel_methods(root_module, cls): + ## simple-channel.h: static ns3::TypeId ns3::SimpleChannel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## simple-channel.h: ns3::SimpleChannel::SimpleChannel() [constructor] + cls.add_constructor([]) + ## simple-channel.h: void ns3::SimpleChannel::Send(ns3::Ptr p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr sender) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')]) + ## simple-channel.h: void ns3::SimpleChannel::Add(ns3::Ptr device) [member function] + cls.add_method('Add', + 'void', + [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')]) + ## simple-channel.h: uint32_t ns3::SimpleChannel::GetNDevices() const [member function] + cls.add_method('GetNDevices', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## simple-channel.h: ns3::Ptr ns3::SimpleChannel::GetDevice(uint32_t i) const [member function] + cls.add_method('GetDevice', + 'ns3::Ptr< ns3::NetDevice >', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + return + def register_Ns3LlcSnapHeader_methods(root_module, cls): ## llc-snap-header.h: ns3::LlcSnapHeader::LlcSnapHeader() [constructor] cls.add_constructor([]) @@ -2423,34 +2451,6 @@ def register_Ns3SimpleNetDevice_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SimpleChannel_methods(root_module, cls): - ## simple-channel.h: static ns3::TypeId ns3::SimpleChannel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## simple-channel.h: ns3::SimpleChannel::SimpleChannel() [constructor] - cls.add_constructor([]) - ## simple-channel.h: void ns3::SimpleChannel::Send(ns3::Ptr p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr sender) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')]) - ## simple-channel.h: void ns3::SimpleChannel::Add(ns3::Ptr device) [member function] - cls.add_method('Add', - 'void', - [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')]) - ## simple-channel.h: uint32_t ns3::SimpleChannel::GetNDevices() const [member function] - cls.add_method('GetNDevices', - 'uint32_t', - [], - is_const=True, is_virtual=True) - ## simple-channel.h: ns3::Ptr ns3::SimpleChannel::GetDevice(uint32_t i) const [member function] - cls.add_method('GetDevice', - 'ns3::Ptr< ns3::NetDevice >', - [param('uint32_t', 'i')], - is_const=True, is_virtual=True) - return - def register_Ns3TcpSocketFactory_methods(root_module, cls): ## tcp-socket-factory.h: static ns3::TypeId ns3::TcpSocketFactory::GetTypeId() [member function] cls.add_method('GetTypeId', diff --git a/bindings/python/ns3_module_simulator.py b/bindings/python/ns3_module_simulator.py index 768adf504..923df6ad4 100644 --- a/bindings/python/ns3_module_simulator.py +++ b/bindings/python/ns3_module_simulator.py @@ -33,6 +33,10 @@ def register_types(module): module.add_class('EventKey', outer_class=root_module['ns3::Scheduler']) ## nstime.h: ns3::TimeValue [class] module.add_class('TimeValue', parent=root_module['ns3::AttributeValue']) + ## simulator-impl.h: ns3::SimulatorImpl [class] + module.add_class('SimulatorImpl', parent=root_module['ns3::Object']) + ## default-simulator-impl.h: ns3::DefaultSimulatorImpl [class] + module.add_class('DefaultSimulatorImpl', parent=root_module['ns3::SimulatorImpl']) ## heap-scheduler.h: ns3::HeapScheduler [class] module.add_class('HeapScheduler', parent=root_module['ns3::Scheduler']) ## list-scheduler.h: ns3::ListScheduler [class] @@ -96,6 +100,8 @@ def register_methods(root_module): register_Ns3Scheduler_methods(root_module, root_module['ns3::Scheduler']) register_Ns3SchedulerEventKey_methods(root_module, root_module['ns3::Scheduler::EventKey']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) + register_Ns3SimulatorImpl_methods(root_module, root_module['ns3::SimulatorImpl']) + register_Ns3DefaultSimulatorImpl_methods(root_module, root_module['ns3::DefaultSimulatorImpl']) register_Ns3HeapScheduler_methods(root_module, root_module['ns3::HeapScheduler']) register_Ns3ListScheduler_methods(root_module, root_module['ns3::ListScheduler']) register_Ns3MapScheduler_methods(root_module, root_module['ns3::MapScheduler']) @@ -326,6 +332,11 @@ def register_Ns3Watchdog_methods(root_module, cls): return def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h: static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + #cls.add_method('SetImplementation', + # 'void', + # [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + # is_static=True) ## simulator.h: static void ns3::Simulator::SetScheduler(ns3::Ptr scheduler) [member function] cls.add_method('SetScheduler', 'void', @@ -597,6 +608,200 @@ def register_Ns3TimeValue_methods(root_module, cls): is_virtual=True) return +def register_Ns3SimulatorImpl_methods(root_module, cls): + ## simulator-impl.h: void ns3::SimulatorImpl::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::EnableLogTo(char const * filename) [member function] + cls.add_method('EnableLogTo', + 'void', + [param('char *', 'filename', transfer_ownership=False, is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: bool ns3::SimulatorImpl::IsFinished() const [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: ns3::Time ns3::SimulatorImpl::Next() const [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time&', 'time', is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::Schedule(ns3::Time const & time, ns3::Ptr const & event) [member function] + cls.add_method('Schedule', + 'ns3::EventId', + [param('ns3::Time&', 'time', is_const=True), param('ns3::Ptr< ns3::EventImpl >&', 'event', is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::ScheduleNow(ns3::Ptr const & event) [member function] + cls.add_method('ScheduleNow', + 'ns3::EventId', + [param('ns3::Ptr< ns3::EventImpl >&', 'event', is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::ScheduleDestroy(ns3::Ptr const & event) [member function] + cls.add_method('ScheduleDestroy', + 'ns3::EventId', + [param('ns3::Ptr< ns3::EventImpl >&', 'event', is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::Remove(ns3::EventId const & ev) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId&', 'ev', is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::Cancel(ns3::EventId const & ev) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId&', 'ev', is_const=True)], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: bool ns3::SimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId&', 'ev', is_const=True)], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::Run() [member function] + cls.add_method('Run', + 'void', + [], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: ns3::Time ns3::SimulatorImpl::Now() const [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: ns3::Time ns3::SimulatorImpl::GetDelayLeft(ns3::EventId const & id) const [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId&', 'id', is_const=True)], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: ns3::Time ns3::SimulatorImpl::GetMaximumSimulationTime() const [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::SetScheduler(ns3::Ptr scheduler) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::Ptr< ns3::Scheduler >', 'scheduler')], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: ns3::Ptr ns3::SimulatorImpl::GetScheduler() const [member function] + cls.add_method('GetScheduler', + 'ns3::Ptr< ns3::Scheduler >', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + cls.add_constructor([]) + return + +def register_Ns3DefaultSimulatorImpl_methods(root_module, cls): + ## default-simulator-impl.h: static ns3::TypeId ns3::DefaultSimulatorImpl::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## default-simulator-impl.h: ns3::DefaultSimulatorImpl::DefaultSimulatorImpl() [constructor] + cls.add_constructor([]) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::EnableLogTo(char const * filename) [member function] + cls.add_method('EnableLogTo', + 'void', + [param('char *', 'filename', transfer_ownership=False, is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: bool ns3::DefaultSimulatorImpl::IsFinished() const [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_const=True, is_virtual=True) + ## default-simulator-impl.h: ns3::Time ns3::DefaultSimulatorImpl::Next() const [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_const=True, is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time&', 'time', is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::Schedule(ns3::Time const & time, ns3::Ptr const & event) [member function] + cls.add_method('Schedule', + 'ns3::EventId', + [param('ns3::Time&', 'time', is_const=True), param('ns3::Ptr< ns3::EventImpl >&', 'event', is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::ScheduleNow(ns3::Ptr const & event) [member function] + cls.add_method('ScheduleNow', + 'ns3::EventId', + [param('ns3::Ptr< ns3::EventImpl >&', 'event', is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::ScheduleDestroy(ns3::Ptr const & event) [member function] + cls.add_method('ScheduleDestroy', + 'ns3::EventId', + [param('ns3::Ptr< ns3::EventImpl >&', 'event', is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Remove(ns3::EventId const & ev) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId&', 'ev', is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Cancel(ns3::EventId const & ev) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId&', 'ev', is_const=True)], + is_virtual=True) + ## default-simulator-impl.h: bool ns3::DefaultSimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId&', 'ev', is_const=True)], + is_const=True, is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Run() [member function] + cls.add_method('Run', + 'void', + [], + is_virtual=True) + ## default-simulator-impl.h: ns3::Time ns3::DefaultSimulatorImpl::Now() const [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_const=True, is_virtual=True) + ## default-simulator-impl.h: ns3::Time ns3::DefaultSimulatorImpl::GetDelayLeft(ns3::EventId const & id) const [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId&', 'id', is_const=True)], + is_const=True, is_virtual=True) + ## default-simulator-impl.h: ns3::Time ns3::DefaultSimulatorImpl::GetMaximumSimulationTime() const [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_const=True, is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::SetScheduler(ns3::Ptr scheduler) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::Ptr< ns3::Scheduler >', 'scheduler')], + is_virtual=True) + ## default-simulator-impl.h: ns3::Ptr ns3::DefaultSimulatorImpl::GetScheduler() const [member function] + cls.add_method('GetScheduler', + 'ns3::Ptr< ns3::Scheduler >', + [], + is_const=True, is_virtual=True) + return + def register_Ns3HeapScheduler_methods(root_module, cls): ## heap-scheduler.h: ns3::HeapScheduler::HeapScheduler() [constructor] cls.add_constructor([]) diff --git a/bindings/python/ns3_module_wifi.py b/bindings/python/ns3_module_wifi.py index 14c660114..6ba85ee09 100644 --- a/bindings/python/ns3_module_wifi.py +++ b/bindings/python/ns3_module_wifi.py @@ -45,12 +45,14 @@ def register_types(module): module.add_class('WifiMac', parent=root_module['ns3::Object']) ## nqap-wifi-mac.h: ns3::NqapWifiMac [class] module.add_class('NqapWifiMac', parent=root_module['ns3::WifiMac']) - ## amrr-wifi-manager.h: ns3::AmrrWifiRemoteStation [class] - module.add_class('AmrrWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## composite-propagation-loss-model.h: ns3::CompositePropagationLossModel [class] module.add_class('CompositePropagationLossModel', parent=root_module['ns3::PropagationLossModel']) + ## amrr-wifi-manager.h: ns3::AmrrWifiRemoteStation [class] + module.add_class('AmrrWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## propagation-loss-model.h: ns3::FriisPropagationLossModel [class] module.add_class('FriisPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) + ## nqsta-wifi-mac.h: ns3::NqstaWifiMac [class] + module.add_class('NqstaWifiMac', parent=root_module['ns3::WifiMac']) ## wifi-remote-station-manager.h: ns3::WifiRemoteStationManager [class] module.add_class('WifiRemoteStationManager', parent=root_module['ns3::Object']) ## wifi-mode.h: ns3::WifiModeValue [class] @@ -75,12 +77,10 @@ def register_types(module): module.add_class('AdhocWifiMac', parent=root_module['ns3::WifiMac']) ## jakes-propagation-loss-model.h: ns3::JakesPropagationLossModel [class] module.add_class('JakesPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) - ## propagation-delay-model.h: ns3::ConstantSpeedPropagationDelayModel [class] - module.add_class('ConstantSpeedPropagationDelayModel', parent=root_module['ns3::PropagationDelayModel']) ## wifi-net-device.h: ns3::WifiNetDevice [class] module.add_class('WifiNetDevice', parent=root_module['ns3::NetDevice']) - ## nqsta-wifi-mac.h: ns3::NqstaWifiMac [class] - module.add_class('NqstaWifiMac', parent=root_module['ns3::WifiMac']) + ## propagation-delay-model.h: ns3::ConstantSpeedPropagationDelayModel [class] + module.add_class('ConstantSpeedPropagationDelayModel', parent=root_module['ns3::PropagationDelayModel']) ## propagation-loss-model.h: ns3::RandomPropagationLossModel [class] module.add_class('RandomPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## propagation-delay-model.h: ns3::RandomPropagationDelayModel [class] @@ -155,9 +155,10 @@ def register_methods(root_module): register_Ns3ArfWifiRemoteStation_methods(root_module, root_module['ns3::ArfWifiRemoteStation']) register_Ns3WifiMac_methods(root_module, root_module['ns3::WifiMac']) register_Ns3NqapWifiMac_methods(root_module, root_module['ns3::NqapWifiMac']) - register_Ns3AmrrWifiRemoteStation_methods(root_module, root_module['ns3::AmrrWifiRemoteStation']) register_Ns3CompositePropagationLossModel_methods(root_module, root_module['ns3::CompositePropagationLossModel']) + register_Ns3AmrrWifiRemoteStation_methods(root_module, root_module['ns3::AmrrWifiRemoteStation']) register_Ns3FriisPropagationLossModel_methods(root_module, root_module['ns3::FriisPropagationLossModel']) + register_Ns3NqstaWifiMac_methods(root_module, root_module['ns3::NqstaWifiMac']) register_Ns3WifiRemoteStationManager_methods(root_module, root_module['ns3::WifiRemoteStationManager']) register_Ns3WifiModeValue_methods(root_module, root_module['ns3::WifiModeValue']) register_Ns3OnoeWifiManager_methods(root_module, root_module['ns3::OnoeWifiManager']) @@ -169,9 +170,8 @@ def register_methods(root_module): register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel']) register_Ns3AdhocWifiMac_methods(root_module, root_module['ns3::AdhocWifiMac']) register_Ns3JakesPropagationLossModel_methods(root_module, root_module['ns3::JakesPropagationLossModel']) - register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, root_module['ns3::ConstantSpeedPropagationDelayModel']) register_Ns3WifiNetDevice_methods(root_module, root_module['ns3::WifiNetDevice']) - register_Ns3NqstaWifiMac_methods(root_module, root_module['ns3::NqstaWifiMac']) + register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, root_module['ns3::ConstantSpeedPropagationDelayModel']) register_Ns3RandomPropagationLossModel_methods(root_module, root_module['ns3::RandomPropagationLossModel']) register_Ns3RandomPropagationDelayModel_methods(root_module, root_module['ns3::RandomPropagationDelayModel']) register_Ns3AmrrWifiManager_methods(root_module, root_module['ns3::AmrrWifiManager']) @@ -1207,6 +1207,30 @@ def register_Ns3NqapWifiMac_methods(root_module, cls): visibility='private', is_virtual=True) return +def register_Ns3CompositePropagationLossModel_methods(root_module, cls): + ## composite-propagation-loss-model.h: static ns3::TypeId ns3::CompositePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## composite-propagation-loss-model.h: ns3::CompositePropagationLossModel::CompositePropagationLossModel() [constructor] + cls.add_constructor([]) + ## composite-propagation-loss-model.h: double ns3::CompositePropagationLossModel::GetLoss(ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('GetLoss', + 'double', + [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, is_virtual=True) + ## composite-propagation-loss-model.h: void ns3::CompositePropagationLossModel::AddPropagationLossModel(ns3::Ptr pl) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'pl')]) + ## composite-propagation-loss-model.h: void ns3::CompositePropagationLossModel::AddDefaults() [member function] + cls.add_method('AddDefaults', + 'void', + [], + visibility='protected', is_virtual=True) + return + def register_Ns3AmrrWifiRemoteStation_methods(root_module, cls): ## amrr-wifi-manager.h: ns3::AmrrWifiRemoteStation::AmrrWifiRemoteStation(ns3::Ptr stations) [constructor] cls.add_constructor([param('ns3::Ptr< ns3::AmrrWifiManager >', 'stations')]) @@ -1262,30 +1286,6 @@ def register_Ns3AmrrWifiRemoteStation_methods(root_module, cls): visibility='private', is_virtual=True) return -def register_Ns3CompositePropagationLossModel_methods(root_module, cls): - ## composite-propagation-loss-model.h: static ns3::TypeId ns3::CompositePropagationLossModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## composite-propagation-loss-model.h: ns3::CompositePropagationLossModel::CompositePropagationLossModel() [constructor] - cls.add_constructor([]) - ## composite-propagation-loss-model.h: double ns3::CompositePropagationLossModel::GetLoss(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetLoss', - 'double', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_const=True, is_virtual=True) - ## composite-propagation-loss-model.h: void ns3::CompositePropagationLossModel::AddPropagationLossModel(ns3::Ptr pl) [member function] - cls.add_method('AddPropagationLossModel', - 'void', - [param('ns3::Ptr< ns3::PropagationLossModel >', 'pl')]) - ## composite-propagation-loss-model.h: void ns3::CompositePropagationLossModel::AddDefaults() [member function] - cls.add_method('AddDefaults', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3FriisPropagationLossModel_methods(root_module, cls): ## propagation-loss-model.h: static ns3::TypeId ns3::FriisPropagationLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', @@ -1332,6 +1332,122 @@ def register_Ns3FriisPropagationLossModel_methods(root_module, cls): is_const=True, is_virtual=True) return +def register_Ns3NqstaWifiMac_methods(root_module, cls): + ## nqsta-wifi-mac.h: static ns3::TypeId ns3::NqstaWifiMac::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## nqsta-wifi-mac.h: ns3::NqstaWifiMac::NqstaWifiMac() [constructor] + cls.add_constructor([]) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetSlot(ns3::Time slotTime) [member function] + cls.add_method('SetSlot', + 'void', + [param('ns3::Time', 'slotTime')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetSifs(ns3::Time sifs) [member function] + cls.add_method('SetSifs', + 'void', + [param('ns3::Time', 'sifs')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetEifsNoDifs(ns3::Time eifsNoDifs) [member function] + cls.add_method('SetEifsNoDifs', + 'void', + [param('ns3::Time', 'eifsNoDifs')], + is_virtual=True) + ## nqsta-wifi-mac.h: ns3::Time ns3::NqstaWifiMac::GetSlot() const [member function] + cls.add_method('GetSlot', + 'ns3::Time', + [], + is_const=True, is_virtual=True) + ## nqsta-wifi-mac.h: ns3::Time ns3::NqstaWifiMac::GetSifs() const [member function] + cls.add_method('GetSifs', + 'ns3::Time', + [], + is_const=True, is_virtual=True) + ## nqsta-wifi-mac.h: ns3::Time ns3::NqstaWifiMac::GetEifsNoDifs() const [member function] + cls.add_method('GetEifsNoDifs', + 'ns3::Time', + [], + is_const=True, is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetWifiPhy(ns3::Ptr phy) [member function] + cls.add_method('SetWifiPhy', + 'void', + [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetWifiRemoteStationManager(ns3::Ptr stationManager) [member function] + cls.add_method('SetWifiRemoteStationManager', + 'void', + [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'stationManager')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::Enqueue(ns3::Ptr packet, ns3::Mac48Address to) [member function] + cls.add_method('Enqueue', + 'void', + [param('ns3::Ptr< const ns3::Packet >', 'packet'), param('ns3::Mac48Address', 'to')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetForwardUpCallback(ns3::Callback, ns3::Mac48Address const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty> upCallback) [member function] + cls.add_method('SetForwardUpCallback', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::Mac48Address const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'upCallback')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetLinkUpCallback(ns3::Callback linkUp) [member function] + cls.add_method('SetLinkUpCallback', + 'void', + [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetLinkDownCallback(ns3::Callback linkDown) [member function] + cls.add_method('SetLinkDownCallback', + 'void', + [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], + is_virtual=True) + ## nqsta-wifi-mac.h: ns3::Mac48Address ns3::NqstaWifiMac::GetAddress() const [member function] + cls.add_method('GetAddress', + 'ns3::Mac48Address', + [], + is_const=True, is_virtual=True) + ## nqsta-wifi-mac.h: ns3::Ssid ns3::NqstaWifiMac::GetSsid() const [member function] + cls.add_method('GetSsid', + 'ns3::Ssid', + [], + is_const=True, is_virtual=True) + ## nqsta-wifi-mac.h: ns3::Mac48Address ns3::NqstaWifiMac::GetBssid() const [member function] + cls.add_method('GetBssid', + 'ns3::Mac48Address', + [], + is_const=True, is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetAddress(ns3::Mac48Address address) [member function] + cls.add_method('SetAddress', + 'void', + [param('ns3::Mac48Address', 'address')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetSsid(ns3::Ssid ssid) [member function] + cls.add_method('SetSsid', + 'void', + [param('ns3::Ssid', 'ssid')], + is_virtual=True) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetMaxMissedBeacons(uint32_t missed) [member function] + cls.add_method('SetMaxMissedBeacons', + 'void', + [param('uint32_t', 'missed')]) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetProbeRequestTimeout(ns3::Time timeout) [member function] + cls.add_method('SetProbeRequestTimeout', + 'void', + [param('ns3::Time', 'timeout')]) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetAssocRequestTimeout(ns3::Time timeout) [member function] + cls.add_method('SetAssocRequestTimeout', + 'void', + [param('ns3::Time', 'timeout')]) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::StartActiveAssociation() [member function] + cls.add_method('StartActiveAssociation', + 'void', + []) + ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='private', is_virtual=True) + return + def register_Ns3WifiRemoteStationManager_methods(root_module, cls): ## wifi-remote-station-manager.h: static ns3::TypeId ns3::WifiRemoteStationManager::GetTypeId() [member function] cls.add_method('GetTypeId', @@ -1895,30 +2011,6 @@ def register_Ns3JakesPropagationLossModel_methods(root_module, cls): [param('uint8_t', 'nOscillators')]) return -def register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h: static ns3::TypeId ns3::ConstantSpeedPropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## propagation-delay-model.h: ns3::ConstantSpeedPropagationDelayModel::ConstantSpeedPropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h: ns3::Time ns3::ConstantSpeedPropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_const=True, is_virtual=True) - ## propagation-delay-model.h: void ns3::ConstantSpeedPropagationDelayModel::SetSpeed(double speed) [member function] - cls.add_method('SetSpeed', - 'void', - [param('double', 'speed')]) - ## propagation-delay-model.h: double ns3::ConstantSpeedPropagationDelayModel::GetSpeed() const [member function] - cls.add_method('GetSpeed', - 'double', - [], - is_const=True) - return - def register_Ns3WifiNetDevice_methods(root_module, cls): ## wifi-net-device.h: static ns3::TypeId ns3::WifiNetDevice::GetTypeId() [member function] cls.add_method('GetTypeId', @@ -2070,120 +2162,28 @@ def register_Ns3WifiNetDevice_methods(root_module, cls): visibility='private', is_virtual=True) return -def register_Ns3NqstaWifiMac_methods(root_module, cls): - ## nqsta-wifi-mac.h: static ns3::TypeId ns3::NqstaWifiMac::GetTypeId() [member function] +def register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, cls): + ## propagation-delay-model.h: static ns3::TypeId ns3::ConstantSpeedPropagationDelayModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) - ## nqsta-wifi-mac.h: ns3::NqstaWifiMac::NqstaWifiMac() [constructor] + ## propagation-delay-model.h: ns3::ConstantSpeedPropagationDelayModel::ConstantSpeedPropagationDelayModel() [constructor] cls.add_constructor([]) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetSlot(ns3::Time slotTime) [member function] - cls.add_method('SetSlot', - 'void', - [param('ns3::Time', 'slotTime')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetSifs(ns3::Time sifs) [member function] - cls.add_method('SetSifs', - 'void', - [param('ns3::Time', 'sifs')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetEifsNoDifs(ns3::Time eifsNoDifs) [member function] - cls.add_method('SetEifsNoDifs', - 'void', - [param('ns3::Time', 'eifsNoDifs')], - is_virtual=True) - ## nqsta-wifi-mac.h: ns3::Time ns3::NqstaWifiMac::GetSlot() const [member function] - cls.add_method('GetSlot', + ## propagation-delay-model.h: ns3::Time ns3::ConstantSpeedPropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('GetDelay', 'ns3::Time', - [], + [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], is_const=True, is_virtual=True) - ## nqsta-wifi-mac.h: ns3::Time ns3::NqstaWifiMac::GetSifs() const [member function] - cls.add_method('GetSifs', - 'ns3::Time', + ## propagation-delay-model.h: void ns3::ConstantSpeedPropagationDelayModel::SetSpeed(double speed) [member function] + cls.add_method('SetSpeed', + 'void', + [param('double', 'speed')]) + ## propagation-delay-model.h: double ns3::ConstantSpeedPropagationDelayModel::GetSpeed() const [member function] + cls.add_method('GetSpeed', + 'double', [], - is_const=True, is_virtual=True) - ## nqsta-wifi-mac.h: ns3::Time ns3::NqstaWifiMac::GetEifsNoDifs() const [member function] - cls.add_method('GetEifsNoDifs', - 'ns3::Time', - [], - is_const=True, is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetWifiPhy(ns3::Ptr phy) [member function] - cls.add_method('SetWifiPhy', - 'void', - [param('ns3::Ptr< ns3::WifiPhy >', 'phy')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetWifiRemoteStationManager(ns3::Ptr stationManager) [member function] - cls.add_method('SetWifiRemoteStationManager', - 'void', - [param('ns3::Ptr< ns3::WifiRemoteStationManager >', 'stationManager')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::Enqueue(ns3::Ptr packet, ns3::Mac48Address to) [member function] - cls.add_method('Enqueue', - 'void', - [param('ns3::Ptr< const ns3::Packet >', 'packet'), param('ns3::Mac48Address', 'to')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetForwardUpCallback(ns3::Callback, ns3::Mac48Address const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty> upCallback) [member function] - cls.add_method('SetForwardUpCallback', - 'void', - [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::Mac48Address const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'upCallback')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetLinkUpCallback(ns3::Callback linkUp) [member function] - cls.add_method('SetLinkUpCallback', - 'void', - [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkUp')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetLinkDownCallback(ns3::Callback linkDown) [member function] - cls.add_method('SetLinkDownCallback', - 'void', - [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'linkDown')], - is_virtual=True) - ## nqsta-wifi-mac.h: ns3::Mac48Address ns3::NqstaWifiMac::GetAddress() const [member function] - cls.add_method('GetAddress', - 'ns3::Mac48Address', - [], - is_const=True, is_virtual=True) - ## nqsta-wifi-mac.h: ns3::Ssid ns3::NqstaWifiMac::GetSsid() const [member function] - cls.add_method('GetSsid', - 'ns3::Ssid', - [], - is_const=True, is_virtual=True) - ## nqsta-wifi-mac.h: ns3::Mac48Address ns3::NqstaWifiMac::GetBssid() const [member function] - cls.add_method('GetBssid', - 'ns3::Mac48Address', - [], - is_const=True, is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetAddress(ns3::Mac48Address address) [member function] - cls.add_method('SetAddress', - 'void', - [param('ns3::Mac48Address', 'address')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetSsid(ns3::Ssid ssid) [member function] - cls.add_method('SetSsid', - 'void', - [param('ns3::Ssid', 'ssid')], - is_virtual=True) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetMaxMissedBeacons(uint32_t missed) [member function] - cls.add_method('SetMaxMissedBeacons', - 'void', - [param('uint32_t', 'missed')]) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetProbeRequestTimeout(ns3::Time timeout) [member function] - cls.add_method('SetProbeRequestTimeout', - 'void', - [param('ns3::Time', 'timeout')]) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::SetAssocRequestTimeout(ns3::Time timeout) [member function] - cls.add_method('SetAssocRequestTimeout', - 'void', - [param('ns3::Time', 'timeout')]) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::StartActiveAssociation() [member function] - cls.add_method('StartActiveAssociation', - 'void', - []) - ## nqsta-wifi-mac.h: void ns3::NqstaWifiMac::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='private', is_virtual=True) + is_const=True) return def register_Ns3RandomPropagationLossModel_methods(root_module, cls): diff --git a/bindings/python/ns3modulescan.py b/bindings/python/ns3modulescan.py index 3a460d953..8f77d5829 100644 --- a/bindings/python/ns3modulescan.py +++ b/bindings/python/ns3modulescan.py @@ -251,11 +251,21 @@ def ns3_module_scan(top_builddir, pygen_file_name, everything_h): module_parser.add_pre_scan_hook(pre_scan_hook) #module_parser.add_post_scan_hook(post_scan_hook) + + gccxml_options = dict( + include_paths=[top_builddir], + define_symbols={ + 'NS3_ASSERT_ENABLE': None, + 'NS3_LOG_ENABLE': None, + } + ) + module_parser.parse_init([everything_h], - include_paths=[top_builddir], whitelist_paths=[top_builddir, os.path.dirname(everything_h)], + None, whitelist_paths=[top_builddir, os.path.dirname(everything_h)], #includes=['"ns3/everything.h"'], pygen_sink=sections, - pygen_classifier=MyPygenClassifier(headers_map)) + pygen_classifier=MyPygenClassifier(headers_map), + gccxml_options=gccxml_options) module_parser.scan_types() callback_classes_file = open(os.path.join(os.path.dirname(pygen_file_name), "callbacks_list.py"), "wt") diff --git a/bindings/python/wscript b/bindings/python/wscript index 701123fae..9f0b33811 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -21,7 +21,7 @@ else: os.environ['PYTHONPATH'] = LOCAL_PYBINDGEN_PATH ## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 8, 0, 515) +REQUIRED_PYBINDGEN_VERSION = (0, 8, 0, 516) REQUIRED_PYGCCXML_VERSION = (0, 9, 5)