diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index 466bf07ad..593f07a92 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -1874,7 +1874,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['long']) + template_parameters=['long long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', @@ -1894,7 +1894,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['unsigned long']) + template_parameters=['unsigned long long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', @@ -1910,22 +1910,14 @@ def register_functions(root_module): 'std::string', [], template_parameters=['unsigned char']) + ## log.h: extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function] + module.add_function('LogComponentDisable', + 'void', + [param('char const *', 'name'), param('ns3::LogLevel', 'level')]) ## string.h: extern ns3::Ptr ns3::MakeStringChecker() [free function] module.add_function('MakeStringChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## enum.h: extern ns3::Ptr ns3::MakeEnumChecker(int v1, std::string n1, int v2=0, std::string n2="", int v3=0, std::string n3="", int v4=0, std::string n4="", int v5=0, std::string n5="", int v6=0, std::string n6="", int v7=0, std::string n7="", int v8=0, std::string n8="", int v9=0, std::string n9="", int v10=0, std::string n10="", int v11=0, std::string n11="", int v12=0, std::string n12="") [free function] - 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 >', - []) ## ptr.h: extern ns3::Ptr ns3::Create() [free function] module.add_function('Create', 'ns3::Ptr< ns3::PointerValue >', @@ -1936,6 +1928,14 @@ def register_functions(root_module): 'ns3::Ptr< ns3::ObjectVectorValue >', [], template_parameters=['ns3::ObjectVectorValue']) + ## 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 >', + []) ## object-factory.h: extern ns3::Ptr ns3::MakeObjectFactoryChecker() [free function] module.add_function('MakeObjectFactoryChecker', 'ns3::Ptr< ns3::AttributeChecker const >', @@ -1952,14 +1952,14 @@ def register_functions(root_module): module.add_function('MakeRandomVariableChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## log.h: extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function] - module.add_function('LogComponentDisable', - 'void', - [param('char const *', 'name'), 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 const *', 'name'), param('ns3::LogLevel', 'level')]) + ## enum.h: extern ns3::Ptr ns3::MakeEnumChecker(int v1, std::string n1, int v2=0, std::string n2="", int v3=0, std::string n3="", int v4=0, std::string n4="", int v5=0, std::string n5="", int v6=0, std::string n6="", int v7=0, std::string n7="", int v8=0, std::string n8="", int v9=0, std::string n9="", int v10=0, std::string n10="", int v11=0, std::string n11="", int v12=0, std::string n12="") [free function] + 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='""')]) 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) @@ -2017,6 +2017,10 @@ def register_functions_ns3_Config(module, root_module): module.add_function('SetGlobalFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern void ns3::Config::Disconnect(std::string path, ns3::CallbackBase const & cb) [free function] + module.add_function('Disconnect', + 'void', + [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) ## config.h: extern uint32_t ns3::Config::GetRootNamespaceObjectN() [free function] module.add_function('GetRootNamespaceObjectN', 'uint32_t', @@ -2033,10 +2037,6 @@ def register_functions_ns3_Config(module, root_module): module.add_function('RegisterRootNamespaceObject', 'void', [param('ns3::Ptr< ns3::Object >', 'obj')]) - ## config.h: extern void ns3::Config::Disconnect(std::string path, ns3::CallbackBase const & cb) [free function] - module.add_function('Disconnect', - 'void', - [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) return def register_functions_ns3_olsr(module, root_module): diff --git a/bindings/python/ns3_module_internet_stack.py b/bindings/python/ns3_module_internet_stack.py index 0d28fcf24..439307348 100644 --- a/bindings/python/ns3_module_internet_stack.py +++ b/bindings/python/ns3_module_internet_stack.py @@ -358,10 +358,11 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('Insert', 'void', [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h: ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) [member function] + ## ipv4-l3-protocol.h: ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] cls.add_method('GetProtocol', 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')]) + [param('int', 'protocolNumber')], + is_const=True) ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] cls.add_method('Remove', 'void', diff --git a/bindings/python/ns3_module_node.py b/bindings/python/ns3_module_node.py index 648908ff5..b73ac1333 100644 --- a/bindings/python/ns3_module_node.py +++ b/bindings/python/ns3_module_node.py @@ -2581,10 +2581,18 @@ def register_Ns3SimpleNetDevice_methods(root_module, cls): def register_functions(root_module): module = root_module - ## mac48-address.h: extern ns3::Ptr ns3::MakeMac48AddressChecker() [free function] - module.add_function('MakeMac48AddressChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) + ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Mac48Address & ad) [free function] + module.add_function('ReadFrom', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address &', 'ad')]) + ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Address & ad, uint32_t len) [free function] + module.add_function('ReadFrom', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Address &', 'ad'), param('uint32_t', 'len')]) + ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Ipv4Address & ad) [free function] + module.add_function('ReadFrom', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv4Address &', 'ad')]) ## ipv4-address.h: extern ns3::Ptr ns3::MakeIpv4AddressChecker() [free function] module.add_function('MakeIpv4AddressChecker', 'ns3::Ptr< ns3::AttributeChecker const >', @@ -2609,18 +2617,10 @@ def register_functions(root_module): module.add_function('MakeIpv4MaskChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Mac48Address & ad) [free function] - module.add_function('ReadFrom', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address &', 'ad')]) - ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Address & ad, uint32_t len) [free function] - module.add_function('ReadFrom', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Address &', 'ad'), param('uint32_t', 'len')]) - ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Ipv4Address & ad) [free function] - module.add_function('ReadFrom', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv4Address &', 'ad')]) + ## mac48-address.h: extern ns3::Ptr ns3::MakeMac48AddressChecker() [free function] + module.add_function('MakeMac48AddressChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) 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_simulator.py b/bindings/python/ns3_module_simulator.py index c2bffd979..535d7ed5b 100644 --- a/bindings/python/ns3_module_simulator.py +++ b/bindings/python/ns3_module_simulator.py @@ -7,12 +7,8 @@ def register_types(module): module.add_class('EventId') ## event-impl.h: ns3::EventImpl [class] module.add_class('EventImpl', allow_subclassing=True) - ## event-impl.h: ns3::EventLock [class] - module.add_class('EventLock', allow_subclassing=True) ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') - ## realtime-simulator-impl.h: ns3::RealtimeEventLock [class] - module.add_class('RealtimeEventLock', parent=root_module['ns3::EventLock']) ## simulator.h: ns3::Simulator [class] module.add_class('Simulator', is_singleton=True) ## nstime.h: ns3::TimeUnit<-1> [class] @@ -31,10 +27,14 @@ def register_types(module): module.add_enum('State', ['RUNNING', 'EXPIRED', 'SUSPENDED'], outer_class=root_module['ns3::Timer']) ## timer-impl.h: ns3::TimerImpl [class] module.add_class('TimerImpl', allow_subclassing=True) + ## wallclock-simulator.h: ns3::WallclockSimulator [class] + module.add_class('WallclockSimulator', is_singleton=True) ## watchdog.h: ns3::Watchdog [class] module.add_class('Watchdog') ## scheduler.h: ns3::Scheduler [class] module.add_class('Scheduler', parent=root_module['ns3::Object']) + ## scheduler.h: ns3::Scheduler::Event [struct] + module.add_class('Event', outer_class=root_module['ns3::Scheduler']) ## scheduler.h: ns3::Scheduler::EventKey [struct] module.add_class('EventKey', outer_class=root_module['ns3::Scheduler']) ## simulator-impl.h: ns3::SimulatorImpl [class] @@ -105,9 +105,7 @@ def register_types_ns3_olsr(module): def register_methods(root_module): register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) - register_Ns3EventLock_methods(root_module, root_module['ns3::EventLock']) register_Ns3HighPrecision_methods(root_module, root_module['ns3::HighPrecision']) - register_Ns3RealtimeEventLock_methods(root_module, root_module['ns3::RealtimeEventLock']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3TimeInvert_methods(root_module, root_module['ns3::TimeInvert']) register_Ns3Scalar_methods(root_module, root_module['ns3::Scalar']) @@ -115,8 +113,10 @@ def register_methods(root_module): register_Ns3TimeSquare_methods(root_module, root_module['ns3::TimeSquare']) register_Ns3Timer_methods(root_module, root_module['ns3::Timer']) register_Ns3TimerImpl_methods(root_module, root_module['ns3::TimerImpl']) + register_Ns3WallclockSimulator_methods(root_module, root_module['ns3::WallclockSimulator']) register_Ns3Watchdog_methods(root_module, root_module['ns3::Watchdog']) register_Ns3Scheduler_methods(root_module, root_module['ns3::Scheduler']) + register_Ns3SchedulerEvent_methods(root_module, root_module['ns3::Scheduler::Event']) register_Ns3SchedulerEventKey_methods(root_module, root_module['ns3::Scheduler::EventKey']) register_Ns3SimulatorImpl_methods(root_module, root_module['ns3::SimulatorImpl']) register_Ns3Synchronizer_methods(root_module, root_module['ns3::Synchronizer']) @@ -197,16 +197,6 @@ def register_Ns3EventImpl_methods(root_module, cls): cls.add_method('IsCancelled', 'bool', []) - ## event-impl.h: static void ns3::EventImpl::SetEventLock(ns3::EventLock * eventLock) [member function] - cls.add_method('SetEventLock', - 'void', - [param('ns3::EventLock *', 'eventLock')], - is_static=True) - ## event-impl.h: static void ns3::EventImpl::SetNoEventLock() [member function] - cls.add_method('SetNoEventLock', - 'void', - [], - is_static=True) ## event-impl.h: void ns3::EventImpl::Notify() [member function] cls.add_method('Notify', 'void', @@ -214,23 +204,6 @@ def register_Ns3EventImpl_methods(root_module, cls): is_pure_virtual=True, visibility='protected', is_virtual=True) return -def register_Ns3EventLock_methods(root_module, cls): - ## event-impl.h: ns3::EventLock::EventLock(ns3::EventLock const & arg0) [copy constructor] - cls.add_constructor([param('ns3::EventLock const &', 'arg0')]) - ## event-impl.h: ns3::EventLock::EventLock() [constructor] - cls.add_constructor([]) - ## event-impl.h: void ns3::EventLock::Lock() [member function] - cls.add_method('Lock', - 'void', - [], - is_pure_virtual=True, is_virtual=True) - ## event-impl.h: void ns3::EventLock::Unlock() [member function] - cls.add_method('Unlock', - 'void', - [], - is_pure_virtual=True, is_virtual=True) - return - def register_Ns3HighPrecision_methods(root_module, cls): ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) @@ -283,23 +256,6 @@ def register_Ns3HighPrecision_methods(root_module, cls): is_static=True) return -def register_Ns3RealtimeEventLock_methods(root_module, cls): - ## realtime-simulator-impl.h: ns3::RealtimeEventLock::RealtimeEventLock(ns3::RealtimeEventLock const & arg0) [copy constructor] - cls.add_constructor([param('ns3::RealtimeEventLock const &', 'arg0')]) - ## realtime-simulator-impl.h: ns3::RealtimeEventLock::RealtimeEventLock() [constructor] - cls.add_constructor([]) - ## realtime-simulator-impl.h: void ns3::RealtimeEventLock::Lock() [member function] - cls.add_method('Lock', - 'void', - [], - is_virtual=True) - ## realtime-simulator-impl.h: void ns3::RealtimeEventLock::Unlock() [member function] - cls.add_method('Unlock', - 'void', - [], - is_virtual=True) - return - def register_Ns3Simulator_methods(root_module, cls): ## simulator.h: ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) @@ -709,6 +665,21 @@ def register_Ns3TimerImpl_methods(root_module, cls): is_pure_virtual=True, is_virtual=True) return +def register_Ns3WallclockSimulator_methods(root_module, cls): + ## wallclock-simulator.h: ns3::WallclockSimulator::WallclockSimulator(ns3::WallclockSimulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::WallclockSimulator const &', 'arg0')]) + ## wallclock-simulator.h: static void ns3::WallclockSimulator::Schedule(ns3::Time const & time, void (*)( ) * f) [member function] + cls.add_method('Schedule', + 'void', + [param('ns3::Time const &', 'time'), param('void ( * ) ( ) *', 'f')], + is_static=True) + ## wallclock-simulator.h: static void ns3::WallclockSimulator::ScheduleNow(void (*)( ) * f) [member function] + cls.add_method('ScheduleNow', + 'void', + [param('void ( * ) ( ) *', 'f')], + is_static=True) + return + def register_Ns3Watchdog_methods(root_module, cls): ## watchdog.h: ns3::Watchdog::Watchdog(ns3::Watchdog const & arg0) [copy constructor] cls.add_constructor([param('ns3::Watchdog const &', 'arg0')]) @@ -730,42 +701,55 @@ def register_Ns3Scheduler_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## scheduler.h: void ns3::Scheduler::Insert(ns3::EventId const & id) [member function] + ## scheduler.h: void ns3::Scheduler::Insert(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Insert', 'void', - [param('ns3::EventId const &', 'id')], + [param('ns3::Scheduler::Event const &', 'ev')], is_pure_virtual=True, is_virtual=True) ## scheduler.h: bool ns3::Scheduler::IsEmpty() const [member function] cls.add_method('IsEmpty', 'bool', [], is_pure_virtual=True, is_const=True, is_virtual=True) - ## scheduler.h: ns3::EventId ns3::Scheduler::PeekNext() const [member function] + ## scheduler.h: ns3::Scheduler::Event ns3::Scheduler::PeekNext() const [member function] cls.add_method('PeekNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_pure_virtual=True, is_const=True, is_virtual=True) - ## scheduler.h: ns3::EventId ns3::Scheduler::RemoveNext() [member function] + ## scheduler.h: ns3::Scheduler::Event ns3::Scheduler::RemoveNext() [member function] cls.add_method('RemoveNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_pure_virtual=True, is_virtual=True) - ## scheduler.h: bool ns3::Scheduler::Remove(ns3::EventId const & id) [member function] + ## scheduler.h: void ns3::Scheduler::Remove(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Remove', - 'bool', - [param('ns3::EventId const &', 'id')], + 'void', + [param('ns3::Scheduler::Event const &', 'ev')], is_pure_virtual=True, is_virtual=True) return +def register_Ns3SchedulerEvent_methods(root_module, cls): + cls.add_binary_comparison_operator('<') + ## scheduler.h: ns3::Scheduler::Event::Event() [constructor] + cls.add_constructor([]) + ## scheduler.h: ns3::Scheduler::Event::Event(ns3::Scheduler::Event const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Scheduler::Event const &', 'arg0')]) + ## scheduler.h: ns3::Scheduler::Event::impl [variable] + cls.add_instance_attribute('impl', 'ns3::EventImpl *', is_const=False) + ## scheduler.h: ns3::Scheduler::Event::key [variable] + cls.add_instance_attribute('key', 'ns3::Scheduler::EventKey', is_const=False) + return + def register_Ns3SchedulerEventKey_methods(root_module, cls): + cls.add_binary_comparison_operator('<') + ## scheduler.h: ns3::Scheduler::EventKey::EventKey() [constructor] + cls.add_constructor([]) + ## scheduler.h: ns3::Scheduler::EventKey::EventKey(ns3::Scheduler::EventKey const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Scheduler::EventKey const &', 'arg0')]) ## scheduler.h: ns3::Scheduler::EventKey::m_ts [variable] cls.add_instance_attribute('m_ts', 'uint64_t', is_const=False) ## scheduler.h: ns3::Scheduler::EventKey::m_uid [variable] cls.add_instance_attribute('m_uid', 'uint32_t', is_const=False) - ## scheduler.h: ns3::Scheduler::EventKey::EventKey(ns3::Scheduler::EventKey const & arg0) [copy constructor] - cls.add_constructor([param('ns3::Scheduler::EventKey const &', 'arg0')]) - ## scheduler.h: ns3::Scheduler::EventKey::EventKey() [constructor] - cls.add_constructor([]) return def register_Ns3SimulatorImpl_methods(root_module, cls): @@ -798,20 +782,20 @@ def register_Ns3SimulatorImpl_methods(root_module, cls): 'void', [param('ns3::Time const &', 'time')], 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] + ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function] cls.add_method('Schedule', 'ns3::EventId', - [param('ns3::Time const &', 'time'), param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], is_pure_virtual=True, is_virtual=True) - ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::ScheduleNow(ns3::Ptr const & event) [member function] + ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function] cls.add_method('ScheduleNow', 'ns3::EventId', - [param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::EventImpl *', 'event')], is_pure_virtual=True, is_virtual=True) - ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::ScheduleDestroy(ns3::Ptr const & event) [member function] + ## simulator-impl.h: ns3::EventId ns3::SimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function] cls.add_method('ScheduleDestroy', 'ns3::EventId', - [param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::EventImpl *', 'event')], is_pure_virtual=True, is_virtual=True) ## simulator-impl.h: void ns3::SimulatorImpl::Remove(ns3::EventId const & ev) [member function] cls.add_method('Remove', @@ -863,6 +847,16 @@ def register_Ns3SimulatorImpl_methods(root_module, cls): 'ns3::Ptr< ns3::Scheduler >', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::ScheduleWallclock(ns3::Time const & time, ns3::EventImpl * event) [member function] + cls.add_method('ScheduleWallclock', + 'void', + [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], + is_pure_virtual=True, is_virtual=True) + ## simulator-impl.h: void ns3::SimulatorImpl::ScheduleWallclockNow(ns3::EventImpl * event) [member function] + cls.add_method('ScheduleWallclockNow', + 'void', + [param('ns3::EventImpl *', 'event')], + is_pure_virtual=True, is_virtual=True) return def register_Ns3Synchronizer_methods(root_module, cls): @@ -1135,20 +1129,20 @@ def register_Ns3DefaultSimulatorImpl_methods(root_module, cls): 'void', [param('ns3::Time const &', 'time')], is_virtual=True) - ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::Schedule(ns3::Time const & time, ns3::Ptr const & event) [member function] + ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function] cls.add_method('Schedule', 'ns3::EventId', - [param('ns3::Time const &', 'time'), param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], is_virtual=True) - ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::ScheduleNow(ns3::Ptr const & event) [member function] + ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function] cls.add_method('ScheduleNow', 'ns3::EventId', - [param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::EventImpl *', 'event')], is_virtual=True) - ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::ScheduleDestroy(ns3::Ptr const & event) [member function] + ## default-simulator-impl.h: ns3::EventId ns3::DefaultSimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function] cls.add_method('ScheduleDestroy', 'ns3::EventId', - [param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::EventImpl *', 'event')], is_virtual=True) ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::Remove(ns3::EventId const & ev) [member function] cls.add_method('Remove', @@ -1200,6 +1194,16 @@ def register_Ns3DefaultSimulatorImpl_methods(root_module, cls): 'ns3::Ptr< ns3::Scheduler >', [], is_const=True, is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::ScheduleWallclock(ns3::Time const & time, ns3::EventImpl * event) [member function] + cls.add_method('ScheduleWallclock', + 'void', + [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], + is_virtual=True) + ## default-simulator-impl.h: void ns3::DefaultSimulatorImpl::ScheduleWallclockNow(ns3::EventImpl * event) [member function] + cls.add_method('ScheduleWallclockNow', + 'void', + [param('ns3::EventImpl *', 'event')], + is_virtual=True) return def register_Ns3HeapScheduler_methods(root_module, cls): @@ -1207,30 +1211,30 @@ def register_Ns3HeapScheduler_methods(root_module, cls): cls.add_constructor([param('ns3::HeapScheduler const &', 'arg0')]) ## heap-scheduler.h: ns3::HeapScheduler::HeapScheduler() [constructor] cls.add_constructor([]) - ## heap-scheduler.h: void ns3::HeapScheduler::Insert(ns3::EventId const & id) [member function] + ## heap-scheduler.h: void ns3::HeapScheduler::Insert(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Insert', 'void', - [param('ns3::EventId const &', 'id')], + [param('ns3::Scheduler::Event const &', 'ev')], is_virtual=True) ## heap-scheduler.h: bool ns3::HeapScheduler::IsEmpty() const [member function] cls.add_method('IsEmpty', 'bool', [], is_const=True, is_virtual=True) - ## heap-scheduler.h: ns3::EventId ns3::HeapScheduler::PeekNext() const [member function] + ## heap-scheduler.h: ns3::Scheduler::Event ns3::HeapScheduler::PeekNext() const [member function] cls.add_method('PeekNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_const=True, is_virtual=True) - ## heap-scheduler.h: ns3::EventId ns3::HeapScheduler::RemoveNext() [member function] + ## heap-scheduler.h: ns3::Scheduler::Event ns3::HeapScheduler::RemoveNext() [member function] cls.add_method('RemoveNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_virtual=True) - ## heap-scheduler.h: bool ns3::HeapScheduler::Remove(ns3::EventId const & ev) [member function] + ## heap-scheduler.h: void ns3::HeapScheduler::Remove(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Remove', - 'bool', - [param('ns3::EventId const &', 'ev')], + 'void', + [param('ns3::Scheduler::Event const &', 'ev')], is_virtual=True) return @@ -1239,30 +1243,30 @@ def register_Ns3ListScheduler_methods(root_module, cls): cls.add_constructor([param('ns3::ListScheduler const &', 'arg0')]) ## list-scheduler.h: ns3::ListScheduler::ListScheduler() [constructor] cls.add_constructor([]) - ## list-scheduler.h: void ns3::ListScheduler::Insert(ns3::EventId const & id) [member function] + ## list-scheduler.h: void ns3::ListScheduler::Insert(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Insert', 'void', - [param('ns3::EventId const &', 'id')], + [param('ns3::Scheduler::Event const &', 'ev')], is_virtual=True) ## list-scheduler.h: bool ns3::ListScheduler::IsEmpty() const [member function] cls.add_method('IsEmpty', 'bool', [], is_const=True, is_virtual=True) - ## list-scheduler.h: ns3::EventId ns3::ListScheduler::PeekNext() const [member function] + ## list-scheduler.h: ns3::Scheduler::Event ns3::ListScheduler::PeekNext() const [member function] cls.add_method('PeekNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_const=True, is_virtual=True) - ## list-scheduler.h: ns3::EventId ns3::ListScheduler::RemoveNext() [member function] + ## list-scheduler.h: ns3::Scheduler::Event ns3::ListScheduler::RemoveNext() [member function] cls.add_method('RemoveNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_virtual=True) - ## list-scheduler.h: bool ns3::ListScheduler::Remove(ns3::EventId const & ev) [member function] + ## list-scheduler.h: void ns3::ListScheduler::Remove(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Remove', - 'bool', - [param('ns3::EventId const &', 'ev')], + 'void', + [param('ns3::Scheduler::Event const &', 'ev')], is_virtual=True) return @@ -1271,30 +1275,30 @@ def register_Ns3MapScheduler_methods(root_module, cls): cls.add_constructor([param('ns3::MapScheduler const &', 'arg0')]) ## map-scheduler.h: ns3::MapScheduler::MapScheduler() [constructor] cls.add_constructor([]) - ## map-scheduler.h: void ns3::MapScheduler::Insert(ns3::EventId const & id) [member function] + ## map-scheduler.h: void ns3::MapScheduler::Insert(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Insert', 'void', - [param('ns3::EventId const &', 'id')], + [param('ns3::Scheduler::Event const &', 'ev')], is_virtual=True) ## map-scheduler.h: bool ns3::MapScheduler::IsEmpty() const [member function] cls.add_method('IsEmpty', 'bool', [], is_const=True, is_virtual=True) - ## map-scheduler.h: ns3::EventId ns3::MapScheduler::PeekNext() const [member function] + ## map-scheduler.h: ns3::Scheduler::Event ns3::MapScheduler::PeekNext() const [member function] cls.add_method('PeekNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_const=True, is_virtual=True) - ## map-scheduler.h: ns3::EventId ns3::MapScheduler::RemoveNext() [member function] + ## map-scheduler.h: ns3::Scheduler::Event ns3::MapScheduler::RemoveNext() [member function] cls.add_method('RemoveNext', - 'ns3::EventId', + 'ns3::Scheduler::Event', [], is_virtual=True) - ## map-scheduler.h: bool ns3::MapScheduler::Remove(ns3::EventId const & ev) [member function] + ## map-scheduler.h: void ns3::MapScheduler::Remove(ns3::Scheduler::Event const & ev) [member function] cls.add_method('Remove', - 'bool', - [param('ns3::EventId const &', 'ev')], + 'void', + [param('ns3::Scheduler::Event const &', 'ev')], is_virtual=True) return @@ -1333,20 +1337,20 @@ def register_Ns3RealtimeSimulatorImpl_methods(root_module, cls): 'void', [param('ns3::Time const &', 'time')], is_virtual=True) - ## realtime-simulator-impl.h: ns3::EventId ns3::RealtimeSimulatorImpl::Schedule(ns3::Time const & time, ns3::Ptr const & event) [member function] + ## realtime-simulator-impl.h: ns3::EventId ns3::RealtimeSimulatorImpl::Schedule(ns3::Time const & time, ns3::EventImpl * event) [member function] cls.add_method('Schedule', 'ns3::EventId', - [param('ns3::Time const &', 'time'), param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], is_virtual=True) - ## realtime-simulator-impl.h: ns3::EventId ns3::RealtimeSimulatorImpl::ScheduleNow(ns3::Ptr const & event) [member function] + ## realtime-simulator-impl.h: ns3::EventId ns3::RealtimeSimulatorImpl::ScheduleNow(ns3::EventImpl * event) [member function] cls.add_method('ScheduleNow', 'ns3::EventId', - [param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::EventImpl *', 'event')], is_virtual=True) - ## realtime-simulator-impl.h: ns3::EventId ns3::RealtimeSimulatorImpl::ScheduleDestroy(ns3::Ptr const & event) [member function] + ## realtime-simulator-impl.h: ns3::EventId ns3::RealtimeSimulatorImpl::ScheduleDestroy(ns3::EventImpl * event) [member function] cls.add_method('ScheduleDestroy', 'ns3::EventId', - [param('ns3::Ptr< ns3::EventImpl > const &', 'event')], + [param('ns3::EventImpl *', 'event')], is_virtual=True) ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::Remove(ns3::EventId const & ev) [member function] cls.add_method('Remove', @@ -1363,13 +1367,13 @@ def register_Ns3RealtimeSimulatorImpl_methods(root_module, cls): 'bool', [param('ns3::EventId const &', 'ev')], is_const=True, is_virtual=True) - ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::RunOneEvent() [member function] - cls.add_method('RunOneEvent', + ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::Run() [member function] + cls.add_method('Run', 'void', [], is_virtual=True) - ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::Run() [member function] - cls.add_method('Run', + ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::RunOneEvent() [member function] + cls.add_method('RunOneEvent', 'void', [], is_virtual=True) @@ -1398,6 +1402,21 @@ def register_Ns3RealtimeSimulatorImpl_methods(root_module, cls): 'ns3::Ptr< ns3::Scheduler >', [], is_const=True, is_virtual=True) + ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::ScheduleWallclock(ns3::Time const & time, ns3::EventImpl * event) [member function] + cls.add_method('ScheduleWallclock', + 'void', + [param('ns3::Time const &', 'time'), param('ns3::EventImpl *', 'event')], + is_virtual=True) + ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::ScheduleWallclockNow(ns3::EventImpl * event) [member function] + cls.add_method('ScheduleWallclockNow', + 'void', + [param('ns3::EventImpl *', 'event')], + is_virtual=True) + ## realtime-simulator-impl.h: ns3::Time ns3::RealtimeSimulatorImpl::RealtimeNow() const [member function] + cls.add_method('RealtimeNow', + 'ns3::Time', + [], + is_const=True) ## realtime-simulator-impl.h: void ns3::RealtimeSimulatorImpl::SetSynchronizationMode(ns3::RealtimeSimulatorImpl::SynchronizationMode mode) [member function] cls.add_method('SetSynchronizationMode', 'void', @@ -1456,6 +1475,10 @@ def register_functions(root_module): module.add_function('Seconds', 'ns3::Time', [param('double', 'seconds')]) + ## make-event.h: extern ns3::EventImpl * ns3::MakeEvent(void (*)( ) * f) [free function] + module.add_function('MakeEvent', + 'ns3::EventImpl *', + [param('void ( * ) ( ) *', 'f')]) ## nstime.h: extern ns3::Time ns3::PicoSeconds(uint64_t ps) [free function] module.add_function('PicoSeconds', 'ns3::Time',