From ba3fac9c45f14e57a5c2dce25cbef3f1356a2ced Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Mon, 6 Dec 2010 17:59:20 +0000 Subject: [PATCH] Python bindings rescan for pyviz --- .../apidefs/gcc-ILP32/ns3_module_contrib.py | 18 -- .../apidefs/gcc-ILP32/ns3_module_core.py | 1 + .../apidefs/gcc-ILP32/ns3_module_simulator.py | 36 +-- .../apidefs/gcc-ILP32/ns3_module_stats.py | 20 -- .../gcc-ILP32/ns3_module_visualizer.py | 125 +++++++++ .../gcc-ILP32/ns3modulegen_generated.py | 256 +++++++++++++++++- .../apidefs/gcc-LP64/ns3_module_contrib.py | 18 -- .../apidefs/gcc-LP64/ns3_module_core.py | 1 + .../apidefs/gcc-LP64/ns3_module_simulator.py | 36 +-- .../apidefs/gcc-LP64/ns3_module_stats.py | 20 -- .../apidefs/gcc-LP64/ns3_module_visualizer.py | 125 +++++++++ .../gcc-LP64/ns3modulegen_generated.py | 256 +++++++++++++++++- 12 files changed, 798 insertions(+), 114 deletions(-) create mode 100644 bindings/python/apidefs/gcc-ILP32/ns3_module_visualizer.py create mode 100644 bindings/python/apidefs/gcc-LP64/ns3_module_visualizer.py diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py index 4ededd58b..4025a5e7e 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py @@ -17,8 +17,6 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') - ## gtk-config-store.h: ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -130,7 +128,6 @@ def register_methods(root_module): register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) - register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -355,21 +352,6 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py index 0e2056619..b680cd39a 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py @@ -211,6 +211,7 @@ def register_types(module): module.add_class('Vector3DChecker', parent=root_module['ns3::AttributeChecker']) ## vector.h: ns3::Vector3DValue [class] module.add_class('Vector3DValue', parent=root_module['ns3::AttributeValue']) + module.add_container('std::set< ns3::TypeId >', 'ns3::TypeId', container_type='set') module.add_container('std::list< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::UanPhy > >', 'ns3::Ptr< ns3::UanPhy >', container_type='list') diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py index 68b7a79fc..afbbbc2f2 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py @@ -5,7 +5,7 @@ def register_types(module): ## event-id.h: ns3::EventId [class] module.add_class('EventId') - ## high-precision-double.h: ns3::HighPrecision [class] + ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') ## simulator.h: ns3::Simulator [class] module.add_class('Simulator', is_singleton=True) @@ -231,65 +231,67 @@ def register_Ns3EventId_methods(root_module, cls): def register_Ns3HighPrecision_methods(root_module, cls): cls.add_output_stream_operator() - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor] + cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')]) + ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor] cls.add_constructor([]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor] cls.add_constructor([param('double', 'value')]) - ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] cls.add_method('Add', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] + ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] cls.add_method('Compare', 'int', [param('ns3::HighPrecision const &', 'o')], is_const=True) - ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] cls.add_method('Div', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function] + ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function] cls.add_method('GetDouble', 'double', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function] cls.add_method('GetHigh', 'int64_t', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', [], is_const=True) - ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function] + ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function] cls.add_method('GetLow', 'uint64_t', [], is_const=True) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] cls.add_method('Invert', 'ns3::HighPrecision', [param('uint64_t', 'v')], is_static=True) - ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] cls.add_method('Mul', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] cls.add_method('MulByInvert', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] cls.add_method('Sub', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] cls.add_method('Zero', 'ns3::HighPrecision', [], diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py index 801b9e0d0..9ecf39d16 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py @@ -19,8 +19,6 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) - ## sqlite-data-output.h: ns3::SqliteDataOutput [class] - module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] @@ -123,7 +121,6 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) - register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -468,23 +465,6 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SqliteDataOutput_methods(root_module, cls): - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] - cls.add_constructor([]) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] - cls.add_method('Output', - 'void', - [param('ns3::DataCollector &', 'dc')], - is_virtual=True) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_visualizer.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_visualizer.py new file mode 100644 index 000000000..5420da4b4 --- /dev/null +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_visualizer.py @@ -0,0 +1,125 @@ +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers + +def register_types(module): + root_module = module.get_root() + + + ## Register a nested module for the namespace Config + + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) + + + ## Register a nested module for the namespace FatalImpl + + nested_module = module.add_cpp_namespace('FatalImpl') + register_types_ns3_FatalImpl(nested_module) + + + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + + ## Register a nested module for the namespace aodv + + nested_module = module.add_cpp_namespace('aodv') + register_types_ns3_aodv(nested_module) + + + ## Register a nested module for the namespace dot11s + + nested_module = module.add_cpp_namespace('dot11s') + register_types_ns3_dot11s(nested_module) + + + ## Register a nested module for the namespace flame + + nested_module = module.add_cpp_namespace('flame') + register_types_ns3_flame(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + + ## Register a nested module for the namespace olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_FatalImpl(module): + root_module = module.get_root() + + +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + +def register_types_ns3_aodv(module): + root_module = module.get_root() + + +def register_types_ns3_dot11s(module): + root_module = module.get_root() + + +def register_types_ns3_flame(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + return + +def register_functions(root_module): + module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) + register_functions_ns3_aodv(module.get_submodule('aodv'), root_module) + register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module) + register_functions_ns3_flame(module.get_submodule('flame'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_FatalImpl(module, root_module): + return + +def register_functions_ns3_addressUtils(module, root_module): + return + +def register_functions_ns3_aodv(module, root_module): + return + +def register_functions_ns3_dot11s(module, root_module): + return + +def register_functions_ns3_flame(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py index fa50a5d6e..783084f7e 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py @@ -15,6 +15,7 @@ import sys import ns3_module_core import ns3_module_simulator import ns3_module_test +import ns3_module_visualizer import ns3_module_mobility import ns3_module_mpi import ns3_module_common @@ -93,6 +94,17 @@ def register_types(module): ns3_module_test__local.register_types(module) root_module.end_section('ns3_module_test') + root_module.begin_section('ns3_module_visualizer') + ns3_module_visualizer.register_types(module) + + try: + import ns3_module_visualizer__local + except ImportError: + pass + else: + ns3_module_visualizer__local.register_types(module) + + root_module.end_section('ns3_module_visualizer') root_module.begin_section('ns3_module_mobility') ns3_module_mobility.register_types(module) @@ -540,6 +552,28 @@ def register_types(module): module.add_class('OlsrHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## olsr-state.h: ns3::OlsrState [class] module.add_class('OlsrState') + ## pyviz.h: ns3::PyViz [class] + module.add_class('PyViz') + ## pyviz.h: ns3::PyViz::PacketCaptureMode [enumeration] + module.add_enum('PacketCaptureMode', ['PACKET_CAPTURE_DISABLED', 'PACKET_CAPTURE_FILTER_HEADERS_OR', 'PACKET_CAPTURE_FILTER_HEADERS_AND'], outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::LastPacketsSample [struct] + module.add_class('LastPacketsSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics [struct] + module.add_class('NetDeviceStatistics', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::NodeStatistics [struct] + module.add_class('NodeStatistics', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions [struct] + module.add_class('PacketCaptureOptions', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::PacketDropSample [struct] + module.add_class('PacketDropSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::PacketSample [struct] + module.add_class('PacketSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::RxPacketSample [struct] + module.add_class('RxPacketSample', parent=root_module['ns3::PyViz::PacketSample'], outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::TransmissionSample [struct] + module.add_class('TransmissionSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::TxPacketSample [struct] + module.add_class('TxPacketSample', parent=root_module['ns3::PyViz::PacketSample'], outer_class=root_module['ns3::PyViz']) ## uan-mac-rc.h: ns3::Reservation [class] module.add_class('Reservation') ## uan-prop-model.h: ns3::Tap [class] @@ -702,6 +736,15 @@ def register_types(module): module.add_container('std::vector< ns3::olsr::IfaceAssocTuple >', 'ns3::olsr::IfaceAssocTuple', container_type='vector') module.add_container('std::vector< ns3::olsr::AssociationTuple >', 'ns3::olsr::AssociationTuple', container_type='vector') module.add_container('std::vector< ns3::olsr::Association >', 'ns3::olsr::Association', container_type='vector') + module.add_container('std::vector< ns3::PyViz::RxPacketSample >', 'ns3::PyViz::RxPacketSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::TxPacketSample >', 'ns3::PyViz::TxPacketSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::PacketSample >', 'ns3::PyViz::PacketSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::TransmissionSample >', 'ns3::PyViz::TransmissionSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::PacketDropSample >', 'ns3::PyViz::PacketDropSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::NetDeviceStatistics >', 'ns3::PyViz::NetDeviceStatistics', container_type='vector') + module.add_container('std::vector< std::string >', 'std::string', container_type='vector') + module.add_container('std::set< unsigned int >', 'unsigned int', container_type='set') + module.add_container('std::vector< ns3::PyViz::NodeStatistics >', 'ns3::PyViz::NodeStatistics', container_type='vector') module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::UanAddress > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::UanAddress >', container_type='list') module.add_container('std::vector< ns3::ServiceFlow * >', 'ns3::ServiceFlow *', container_type='vector') module.add_container('std::vector< ns3::Tap >', 'ns3::Tap', container_type='vector') @@ -777,7 +820,6 @@ def register_types(module): def register_types_ns3_Config(module): root_module = module.get_root() - module.add_container('std::vector< std::string >', 'std::string', container_type='vector') def register_types_ns3_FatalImpl(module): root_module = module.get_root() @@ -854,7 +896,6 @@ def register_types_ns3_olsr(module): module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector') module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector') module.add_container('std::vector< ns3::olsr::RoutingTableEntry >', 'ns3::olsr::RoutingTableEntry', container_type='vector') - module.add_container('std::set< unsigned int >', 'unsigned int', container_type='set') typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&') @@ -907,6 +948,16 @@ def register_methods(root_module): register_Ns3Ipv6StaticRoutingHelper_methods(root_module, root_module['ns3::Ipv6StaticRoutingHelper']) register_Ns3OlsrHelper_methods(root_module, root_module['ns3::OlsrHelper']) register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState']) + register_Ns3PyViz_methods(root_module, root_module['ns3::PyViz']) + register_Ns3PyVizLastPacketsSample_methods(root_module, root_module['ns3::PyViz::LastPacketsSample']) + register_Ns3PyVizNetDeviceStatistics_methods(root_module, root_module['ns3::PyViz::NetDeviceStatistics']) + register_Ns3PyVizNodeStatistics_methods(root_module, root_module['ns3::PyViz::NodeStatistics']) + register_Ns3PyVizPacketCaptureOptions_methods(root_module, root_module['ns3::PyViz::PacketCaptureOptions']) + register_Ns3PyVizPacketDropSample_methods(root_module, root_module['ns3::PyViz::PacketDropSample']) + register_Ns3PyVizPacketSample_methods(root_module, root_module['ns3::PyViz::PacketSample']) + register_Ns3PyVizRxPacketSample_methods(root_module, root_module['ns3::PyViz::RxPacketSample']) + register_Ns3PyVizTransmissionSample_methods(root_module, root_module['ns3::PyViz::TransmissionSample']) + register_Ns3PyVizTxPacketSample_methods(root_module, root_module['ns3::PyViz::TxPacketSample']) register_Ns3Reservation_methods(root_module, root_module['ns3::Reservation']) register_Ns3Tap_methods(root_module, root_module['ns3::Tap']) register_Ns3UanAddress_methods(root_module, root_module['ns3::UanAddress']) @@ -1029,6 +1080,17 @@ def register_methods(root_module): ns3_module_test__local.register_methods(root_module) root_module.end_section('ns3_module_test') + root_module.begin_section('ns3_module_visualizer') + ns3_module_visualizer.register_methods(root_module) + + try: + import ns3_module_visualizer__local + except ImportError: + pass + else: + ns3_module_visualizer__local.register_methods(root_module) + + root_module.end_section('ns3_module_visualizer') root_module.begin_section('ns3_module_mobility') ns3_module_mobility.register_methods(root_module) @@ -2432,6 +2494,185 @@ def register_Ns3OlsrState_methods(root_module, cls): [param('ns3::olsr::MprSet', 'mprSet')]) return +def register_Ns3PyViz_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PyViz(ns3::PyViz const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PyViz() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::LastPacketsSample ns3::PyViz::GetLastPackets(uint32_t nodeId) const [member function] + cls.add_method('GetLastPackets', + 'ns3::PyViz::LastPacketsSample', + [param('uint32_t', 'nodeId')], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetNodesStatistics() const [member function] + cls.add_method('GetNodesStatistics', + 'std::vector< ns3::PyViz::NodeStatistics >', + [], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetPacketDropSamples() const [member function] + cls.add_method('GetPacketDropSamples', + 'std::vector< ns3::PyViz::PacketDropSample >', + [], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetPauseMessages() const [member function] + cls.add_method('GetPauseMessages', + 'std::vector< std::string >', + [], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetTransmissionSamples() const [member function] + cls.add_method('GetTransmissionSamples', + 'std::vector< ns3::PyViz::TransmissionSample >', + [], + is_const=True) + ## pyviz.h: static void ns3::PyViz::LineClipping(double boundsX1, double boundsY1, double boundsX2, double boundsY2, double & lineX1, double & lineY1, double & lineX2, double & lineY2) [member function] + cls.add_method('LineClipping', + 'void', + [param('double', 'boundsX1'), param('double', 'boundsY1'), param('double', 'boundsX2'), param('double', 'boundsY2'), param('double &', 'lineX1', direction=3), param('double &', 'lineY1', direction=3), param('double &', 'lineX2', direction=3), param('double &', 'lineY2', direction=3)], + is_static=True) + ## pyviz.h: static void ns3::PyViz::Pause(std::string const & message) [member function] + cls.add_method('Pause', + 'void', + [param('std::string const &', 'message')], + is_static=True) + ## pyviz.h: void ns3::PyViz::RegisterCsmaLikeDevice(std::string const & deviceTypeName) [member function] + cls.add_method('RegisterCsmaLikeDevice', + 'void', + [param('std::string const &', 'deviceTypeName')]) + ## pyviz.h: void ns3::PyViz::RegisterDropTracePath(std::string const & tracePath) [member function] + cls.add_method('RegisterDropTracePath', + 'void', + [param('std::string const &', 'tracePath')]) + ## pyviz.h: void ns3::PyViz::RegisterPointToPointLikeDevice(std::string const & deviceTypeName) [member function] + cls.add_method('RegisterPointToPointLikeDevice', + 'void', + [param('std::string const &', 'deviceTypeName')]) + ## pyviz.h: void ns3::PyViz::RegisterWifiLikeDevice(std::string const & deviceTypeName) [member function] + cls.add_method('RegisterWifiLikeDevice', + 'void', + [param('std::string const &', 'deviceTypeName')]) + ## pyviz.h: void ns3::PyViz::SetNodesOfInterest(std::set, std::allocator > nodes) [member function] + cls.add_method('SetNodesOfInterest', + 'void', + [param('std::set< unsigned int >', 'nodes')]) + ## pyviz.h: void ns3::PyViz::SetPacketCaptureOptions(uint32_t nodeId, ns3::PyViz::PacketCaptureOptions options) [member function] + cls.add_method('SetPacketCaptureOptions', + 'void', + [param('uint32_t', 'nodeId'), param('ns3::PyViz::PacketCaptureOptions', 'options')]) + ## pyviz.h: void ns3::PyViz::SimulatorRunUntil(ns3::Time time) [member function] + cls.add_method('SimulatorRunUntil', + 'void', + [param('ns3::Time', 'time')]) + return + +def register_Ns3PyVizLastPacketsSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::LastPacketsSample::LastPacketsSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::LastPacketsSample::LastPacketsSample(ns3::PyViz::LastPacketsSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::LastPacketsSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::LastPacketsSample::lastDroppedPackets [variable] + cls.add_instance_attribute('lastDroppedPackets', 'std::vector< ns3::PyViz::PacketSample >', is_const=False) + ## pyviz.h: ns3::PyViz::LastPacketsSample::lastReceivedPackets [variable] + cls.add_instance_attribute('lastReceivedPackets', 'std::vector< ns3::PyViz::RxPacketSample >', is_const=False) + ## pyviz.h: ns3::PyViz::LastPacketsSample::lastTransmittedPackets [variable] + cls.add_instance_attribute('lastTransmittedPackets', 'std::vector< ns3::PyViz::TxPacketSample >', is_const=False) + return + +def register_Ns3PyVizNetDeviceStatistics_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::NetDeviceStatistics(ns3::PyViz::NetDeviceStatistics const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::NetDeviceStatistics const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::NetDeviceStatistics() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::receivedBytes [variable] + cls.add_instance_attribute('receivedBytes', 'uint64_t', is_const=False) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::receivedPackets [variable] + cls.add_instance_attribute('receivedPackets', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::transmittedBytes [variable] + cls.add_instance_attribute('transmittedBytes', 'uint64_t', is_const=False) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::transmittedPackets [variable] + cls.add_instance_attribute('transmittedPackets', 'uint32_t', is_const=False) + return + +def register_Ns3PyVizNodeStatistics_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::NodeStatistics::NodeStatistics() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::NodeStatistics::NodeStatistics(ns3::PyViz::NodeStatistics const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::NodeStatistics const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::NodeStatistics::nodeId [variable] + cls.add_instance_attribute('nodeId', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::NodeStatistics::statistics [variable] + cls.add_instance_attribute('statistics', 'std::vector< ns3::PyViz::NetDeviceStatistics >', is_const=False) + return + +def register_Ns3PyVizPacketCaptureOptions_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::PacketCaptureOptions() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::PacketCaptureOptions(ns3::PyViz::PacketCaptureOptions const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::PacketCaptureOptions const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::headers [variable] + cls.add_instance_attribute('headers', 'std::set< ns3::TypeId >', is_const=False) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::mode [variable] + cls.add_instance_attribute('mode', 'ns3::PyViz::PacketCaptureMode', is_const=False) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::numLastPackets [variable] + cls.add_instance_attribute('numLastPackets', 'uint32_t', is_const=False) + return + +def register_Ns3PyVizPacketDropSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PacketDropSample::PacketDropSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::PacketDropSample::PacketDropSample(ns3::PyViz::PacketDropSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::PacketDropSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PacketDropSample::bytes [variable] + cls.add_instance_attribute('bytes', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::PacketDropSample::transmitter [variable] + cls.add_instance_attribute('transmitter', 'ns3::Ptr< ns3::Node >', is_const=False) + return + +def register_Ns3PyVizPacketSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PacketSample::PacketSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::PacketSample::PacketSample(ns3::PyViz::PacketSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::PacketSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PacketSample::device [variable] + cls.add_instance_attribute('device', 'ns3::Ptr< ns3::NetDevice >', is_const=False) + ## pyviz.h: ns3::PyViz::PacketSample::packet [variable] + cls.add_instance_attribute('packet', 'ns3::Ptr< ns3::Packet >', is_const=False) + ## pyviz.h: ns3::PyViz::PacketSample::time [variable] + cls.add_instance_attribute('time', 'ns3::Time', is_const=False) + return + +def register_Ns3PyVizRxPacketSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::RxPacketSample::RxPacketSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::RxPacketSample::RxPacketSample(ns3::PyViz::RxPacketSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::RxPacketSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::RxPacketSample::from [variable] + cls.add_instance_attribute('from', 'ns3::Mac48Address', is_const=False) + return + +def register_Ns3PyVizTransmissionSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::TransmissionSample::TransmissionSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::TransmissionSample::TransmissionSample(ns3::PyViz::TransmissionSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::TransmissionSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::TransmissionSample::bytes [variable] + cls.add_instance_attribute('bytes', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::TransmissionSample::channel [variable] + cls.add_instance_attribute('channel', 'ns3::Ptr< ns3::Channel >', is_const=False) + ## pyviz.h: ns3::PyViz::TransmissionSample::receiver [variable] + cls.add_instance_attribute('receiver', 'ns3::Ptr< ns3::Node >', is_const=False) + ## pyviz.h: ns3::PyViz::TransmissionSample::transmitter [variable] + cls.add_instance_attribute('transmitter', 'ns3::Ptr< ns3::Node >', is_const=False) + return + +def register_Ns3PyVizTxPacketSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::TxPacketSample::TxPacketSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::TxPacketSample::TxPacketSample(ns3::PyViz::TxPacketSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::TxPacketSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::TxPacketSample::to [variable] + cls.add_instance_attribute('to', 'ns3::Mac48Address', is_const=False) + return + def register_Ns3Reservation_methods(root_module, cls): ## uan-mac-rc.h: ns3::Reservation::Reservation(ns3::Reservation const & arg0) [copy constructor] cls.add_constructor([param('ns3::Reservation const &', 'arg0')]) @@ -7136,6 +7377,17 @@ def register_functions(root_module): ns3_module_test__local.register_functions(root_module) root_module.end_section('ns3_module_test') + root_module.begin_section('ns3_module_visualizer') + ns3_module_visualizer.register_functions(root_module) + + try: + import ns3_module_visualizer__local + except ImportError: + pass + else: + ns3_module_visualizer__local.register_functions(root_module) + + root_module.end_section('ns3_module_visualizer') root_module.begin_section('ns3_module_mobility') ns3_module_mobility.register_functions(root_module) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py index 4ededd58b..4025a5e7e 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py @@ -17,8 +17,6 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') - ## gtk-config-store.h: ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -130,7 +128,6 @@ def register_methods(root_module): register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) - register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -355,21 +352,6 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py index 9528019ae..a52c9802d 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py @@ -211,6 +211,7 @@ def register_types(module): module.add_class('Vector3DChecker', parent=root_module['ns3::AttributeChecker']) ## vector.h: ns3::Vector3DValue [class] module.add_class('Vector3DValue', parent=root_module['ns3::AttributeValue']) + module.add_container('std::set< ns3::TypeId >', 'ns3::TypeId', container_type='set') module.add_container('std::list< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::UanPhy > >', 'ns3::Ptr< ns3::UanPhy >', container_type='list') diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py index 68b7a79fc..afbbbc2f2 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py @@ -5,7 +5,7 @@ def register_types(module): ## event-id.h: ns3::EventId [class] module.add_class('EventId') - ## high-precision-double.h: ns3::HighPrecision [class] + ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') ## simulator.h: ns3::Simulator [class] module.add_class('Simulator', is_singleton=True) @@ -231,65 +231,67 @@ def register_Ns3EventId_methods(root_module, cls): def register_Ns3HighPrecision_methods(root_module, cls): cls.add_output_stream_operator() - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor] + cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')]) + ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor] cls.add_constructor([]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor] cls.add_constructor([param('double', 'value')]) - ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] cls.add_method('Add', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] + ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] cls.add_method('Compare', 'int', [param('ns3::HighPrecision const &', 'o')], is_const=True) - ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] cls.add_method('Div', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function] + ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function] cls.add_method('GetDouble', 'double', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function] cls.add_method('GetHigh', 'int64_t', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', [], is_const=True) - ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function] + ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function] cls.add_method('GetLow', 'uint64_t', [], is_const=True) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] cls.add_method('Invert', 'ns3::HighPrecision', [param('uint64_t', 'v')], is_static=True) - ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] cls.add_method('Mul', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] cls.add_method('MulByInvert', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] cls.add_method('Sub', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] cls.add_method('Zero', 'ns3::HighPrecision', [], diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py index 801b9e0d0..9ecf39d16 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py @@ -19,8 +19,6 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) - ## sqlite-data-output.h: ns3::SqliteDataOutput [class] - module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] @@ -123,7 +121,6 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) - register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -468,23 +465,6 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SqliteDataOutput_methods(root_module, cls): - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] - cls.add_constructor([]) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] - cls.add_method('Output', - 'void', - [param('ns3::DataCollector &', 'dc')], - is_virtual=True) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_visualizer.py b/bindings/python/apidefs/gcc-LP64/ns3_module_visualizer.py new file mode 100644 index 000000000..5420da4b4 --- /dev/null +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_visualizer.py @@ -0,0 +1,125 @@ +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers + +def register_types(module): + root_module = module.get_root() + + + ## Register a nested module for the namespace Config + + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) + + + ## Register a nested module for the namespace FatalImpl + + nested_module = module.add_cpp_namespace('FatalImpl') + register_types_ns3_FatalImpl(nested_module) + + + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + + ## Register a nested module for the namespace aodv + + nested_module = module.add_cpp_namespace('aodv') + register_types_ns3_aodv(nested_module) + + + ## Register a nested module for the namespace dot11s + + nested_module = module.add_cpp_namespace('dot11s') + register_types_ns3_dot11s(nested_module) + + + ## Register a nested module for the namespace flame + + nested_module = module.add_cpp_namespace('flame') + register_types_ns3_flame(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + + ## Register a nested module for the namespace olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_FatalImpl(module): + root_module = module.get_root() + + +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + +def register_types_ns3_aodv(module): + root_module = module.get_root() + + +def register_types_ns3_dot11s(module): + root_module = module.get_root() + + +def register_types_ns3_flame(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + return + +def register_functions(root_module): + module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) + register_functions_ns3_aodv(module.get_submodule('aodv'), root_module) + register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module) + register_functions_ns3_flame(module.get_submodule('flame'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_FatalImpl(module, root_module): + return + +def register_functions_ns3_addressUtils(module, root_module): + return + +def register_functions_ns3_aodv(module, root_module): + return + +def register_functions_ns3_dot11s(module, root_module): + return + +def register_functions_ns3_flame(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py index 7668ecbcd..84f0a372f 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py +++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py @@ -15,6 +15,7 @@ import sys import ns3_module_core import ns3_module_simulator import ns3_module_test +import ns3_module_visualizer import ns3_module_mobility import ns3_module_mpi import ns3_module_common @@ -93,6 +94,17 @@ def register_types(module): ns3_module_test__local.register_types(module) root_module.end_section('ns3_module_test') + root_module.begin_section('ns3_module_visualizer') + ns3_module_visualizer.register_types(module) + + try: + import ns3_module_visualizer__local + except ImportError: + pass + else: + ns3_module_visualizer__local.register_types(module) + + root_module.end_section('ns3_module_visualizer') root_module.begin_section('ns3_module_mobility') ns3_module_mobility.register_types(module) @@ -540,6 +552,28 @@ def register_types(module): module.add_class('OlsrHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## olsr-state.h: ns3::OlsrState [class] module.add_class('OlsrState') + ## pyviz.h: ns3::PyViz [class] + module.add_class('PyViz') + ## pyviz.h: ns3::PyViz::PacketCaptureMode [enumeration] + module.add_enum('PacketCaptureMode', ['PACKET_CAPTURE_DISABLED', 'PACKET_CAPTURE_FILTER_HEADERS_OR', 'PACKET_CAPTURE_FILTER_HEADERS_AND'], outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::LastPacketsSample [struct] + module.add_class('LastPacketsSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics [struct] + module.add_class('NetDeviceStatistics', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::NodeStatistics [struct] + module.add_class('NodeStatistics', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions [struct] + module.add_class('PacketCaptureOptions', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::PacketDropSample [struct] + module.add_class('PacketDropSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::PacketSample [struct] + module.add_class('PacketSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::RxPacketSample [struct] + module.add_class('RxPacketSample', parent=root_module['ns3::PyViz::PacketSample'], outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::TransmissionSample [struct] + module.add_class('TransmissionSample', outer_class=root_module['ns3::PyViz']) + ## pyviz.h: ns3::PyViz::TxPacketSample [struct] + module.add_class('TxPacketSample', parent=root_module['ns3::PyViz::PacketSample'], outer_class=root_module['ns3::PyViz']) ## uan-mac-rc.h: ns3::Reservation [class] module.add_class('Reservation') ## uan-prop-model.h: ns3::Tap [class] @@ -702,6 +736,15 @@ def register_types(module): module.add_container('std::vector< ns3::olsr::IfaceAssocTuple >', 'ns3::olsr::IfaceAssocTuple', container_type='vector') module.add_container('std::vector< ns3::olsr::AssociationTuple >', 'ns3::olsr::AssociationTuple', container_type='vector') module.add_container('std::vector< ns3::olsr::Association >', 'ns3::olsr::Association', container_type='vector') + module.add_container('std::vector< ns3::PyViz::RxPacketSample >', 'ns3::PyViz::RxPacketSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::TxPacketSample >', 'ns3::PyViz::TxPacketSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::PacketSample >', 'ns3::PyViz::PacketSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::TransmissionSample >', 'ns3::PyViz::TransmissionSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::PacketDropSample >', 'ns3::PyViz::PacketDropSample', container_type='vector') + module.add_container('std::vector< ns3::PyViz::NetDeviceStatistics >', 'ns3::PyViz::NetDeviceStatistics', container_type='vector') + module.add_container('std::vector< std::string >', 'std::string', container_type='vector') + module.add_container('std::set< unsigned int >', 'unsigned int', container_type='set') + module.add_container('std::vector< ns3::PyViz::NodeStatistics >', 'ns3::PyViz::NodeStatistics', container_type='vector') module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::UanAddress > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::UanAddress >', container_type='list') module.add_container('std::vector< ns3::ServiceFlow * >', 'ns3::ServiceFlow *', container_type='vector') module.add_container('std::vector< ns3::Tap >', 'ns3::Tap', container_type='vector') @@ -777,7 +820,6 @@ def register_types(module): def register_types_ns3_Config(module): root_module = module.get_root() - module.add_container('std::vector< std::string >', 'std::string', container_type='vector') def register_types_ns3_FatalImpl(module): root_module = module.get_root() @@ -854,7 +896,6 @@ def register_types_ns3_olsr(module): module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector') module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector') module.add_container('std::vector< ns3::olsr::RoutingTableEntry >', 'ns3::olsr::RoutingTableEntry', container_type='vector') - module.add_container('std::set< unsigned int >', 'unsigned int', container_type='set') typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&') @@ -907,6 +948,16 @@ def register_methods(root_module): register_Ns3Ipv6StaticRoutingHelper_methods(root_module, root_module['ns3::Ipv6StaticRoutingHelper']) register_Ns3OlsrHelper_methods(root_module, root_module['ns3::OlsrHelper']) register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState']) + register_Ns3PyViz_methods(root_module, root_module['ns3::PyViz']) + register_Ns3PyVizLastPacketsSample_methods(root_module, root_module['ns3::PyViz::LastPacketsSample']) + register_Ns3PyVizNetDeviceStatistics_methods(root_module, root_module['ns3::PyViz::NetDeviceStatistics']) + register_Ns3PyVizNodeStatistics_methods(root_module, root_module['ns3::PyViz::NodeStatistics']) + register_Ns3PyVizPacketCaptureOptions_methods(root_module, root_module['ns3::PyViz::PacketCaptureOptions']) + register_Ns3PyVizPacketDropSample_methods(root_module, root_module['ns3::PyViz::PacketDropSample']) + register_Ns3PyVizPacketSample_methods(root_module, root_module['ns3::PyViz::PacketSample']) + register_Ns3PyVizRxPacketSample_methods(root_module, root_module['ns3::PyViz::RxPacketSample']) + register_Ns3PyVizTransmissionSample_methods(root_module, root_module['ns3::PyViz::TransmissionSample']) + register_Ns3PyVizTxPacketSample_methods(root_module, root_module['ns3::PyViz::TxPacketSample']) register_Ns3Reservation_methods(root_module, root_module['ns3::Reservation']) register_Ns3Tap_methods(root_module, root_module['ns3::Tap']) register_Ns3UanAddress_methods(root_module, root_module['ns3::UanAddress']) @@ -1029,6 +1080,17 @@ def register_methods(root_module): ns3_module_test__local.register_methods(root_module) root_module.end_section('ns3_module_test') + root_module.begin_section('ns3_module_visualizer') + ns3_module_visualizer.register_methods(root_module) + + try: + import ns3_module_visualizer__local + except ImportError: + pass + else: + ns3_module_visualizer__local.register_methods(root_module) + + root_module.end_section('ns3_module_visualizer') root_module.begin_section('ns3_module_mobility') ns3_module_mobility.register_methods(root_module) @@ -2432,6 +2494,185 @@ def register_Ns3OlsrState_methods(root_module, cls): [param('ns3::olsr::MprSet', 'mprSet')]) return +def register_Ns3PyViz_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PyViz(ns3::PyViz const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PyViz() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::LastPacketsSample ns3::PyViz::GetLastPackets(uint32_t nodeId) const [member function] + cls.add_method('GetLastPackets', + 'ns3::PyViz::LastPacketsSample', + [param('uint32_t', 'nodeId')], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetNodesStatistics() const [member function] + cls.add_method('GetNodesStatistics', + 'std::vector< ns3::PyViz::NodeStatistics >', + [], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetPacketDropSamples() const [member function] + cls.add_method('GetPacketDropSamples', + 'std::vector< ns3::PyViz::PacketDropSample >', + [], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetPauseMessages() const [member function] + cls.add_method('GetPauseMessages', + 'std::vector< std::string >', + [], + is_const=True) + ## pyviz.h: std::vector > ns3::PyViz::GetTransmissionSamples() const [member function] + cls.add_method('GetTransmissionSamples', + 'std::vector< ns3::PyViz::TransmissionSample >', + [], + is_const=True) + ## pyviz.h: static void ns3::PyViz::LineClipping(double boundsX1, double boundsY1, double boundsX2, double boundsY2, double & lineX1, double & lineY1, double & lineX2, double & lineY2) [member function] + cls.add_method('LineClipping', + 'void', + [param('double', 'boundsX1'), param('double', 'boundsY1'), param('double', 'boundsX2'), param('double', 'boundsY2'), param('double &', 'lineX1', direction=3), param('double &', 'lineY1', direction=3), param('double &', 'lineX2', direction=3), param('double &', 'lineY2', direction=3)], + is_static=True) + ## pyviz.h: static void ns3::PyViz::Pause(std::string const & message) [member function] + cls.add_method('Pause', + 'void', + [param('std::string const &', 'message')], + is_static=True) + ## pyviz.h: void ns3::PyViz::RegisterCsmaLikeDevice(std::string const & deviceTypeName) [member function] + cls.add_method('RegisterCsmaLikeDevice', + 'void', + [param('std::string const &', 'deviceTypeName')]) + ## pyviz.h: void ns3::PyViz::RegisterDropTracePath(std::string const & tracePath) [member function] + cls.add_method('RegisterDropTracePath', + 'void', + [param('std::string const &', 'tracePath')]) + ## pyviz.h: void ns3::PyViz::RegisterPointToPointLikeDevice(std::string const & deviceTypeName) [member function] + cls.add_method('RegisterPointToPointLikeDevice', + 'void', + [param('std::string const &', 'deviceTypeName')]) + ## pyviz.h: void ns3::PyViz::RegisterWifiLikeDevice(std::string const & deviceTypeName) [member function] + cls.add_method('RegisterWifiLikeDevice', + 'void', + [param('std::string const &', 'deviceTypeName')]) + ## pyviz.h: void ns3::PyViz::SetNodesOfInterest(std::set, std::allocator > nodes) [member function] + cls.add_method('SetNodesOfInterest', + 'void', + [param('std::set< unsigned int >', 'nodes')]) + ## pyviz.h: void ns3::PyViz::SetPacketCaptureOptions(uint32_t nodeId, ns3::PyViz::PacketCaptureOptions options) [member function] + cls.add_method('SetPacketCaptureOptions', + 'void', + [param('uint32_t', 'nodeId'), param('ns3::PyViz::PacketCaptureOptions', 'options')]) + ## pyviz.h: void ns3::PyViz::SimulatorRunUntil(ns3::Time time) [member function] + cls.add_method('SimulatorRunUntil', + 'void', + [param('ns3::Time', 'time')]) + return + +def register_Ns3PyVizLastPacketsSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::LastPacketsSample::LastPacketsSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::LastPacketsSample::LastPacketsSample(ns3::PyViz::LastPacketsSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::LastPacketsSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::LastPacketsSample::lastDroppedPackets [variable] + cls.add_instance_attribute('lastDroppedPackets', 'std::vector< ns3::PyViz::PacketSample >', is_const=False) + ## pyviz.h: ns3::PyViz::LastPacketsSample::lastReceivedPackets [variable] + cls.add_instance_attribute('lastReceivedPackets', 'std::vector< ns3::PyViz::RxPacketSample >', is_const=False) + ## pyviz.h: ns3::PyViz::LastPacketsSample::lastTransmittedPackets [variable] + cls.add_instance_attribute('lastTransmittedPackets', 'std::vector< ns3::PyViz::TxPacketSample >', is_const=False) + return + +def register_Ns3PyVizNetDeviceStatistics_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::NetDeviceStatistics(ns3::PyViz::NetDeviceStatistics const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::NetDeviceStatistics const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::NetDeviceStatistics() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::receivedBytes [variable] + cls.add_instance_attribute('receivedBytes', 'uint64_t', is_const=False) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::receivedPackets [variable] + cls.add_instance_attribute('receivedPackets', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::transmittedBytes [variable] + cls.add_instance_attribute('transmittedBytes', 'uint64_t', is_const=False) + ## pyviz.h: ns3::PyViz::NetDeviceStatistics::transmittedPackets [variable] + cls.add_instance_attribute('transmittedPackets', 'uint32_t', is_const=False) + return + +def register_Ns3PyVizNodeStatistics_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::NodeStatistics::NodeStatistics() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::NodeStatistics::NodeStatistics(ns3::PyViz::NodeStatistics const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::NodeStatistics const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::NodeStatistics::nodeId [variable] + cls.add_instance_attribute('nodeId', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::NodeStatistics::statistics [variable] + cls.add_instance_attribute('statistics', 'std::vector< ns3::PyViz::NetDeviceStatistics >', is_const=False) + return + +def register_Ns3PyVizPacketCaptureOptions_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::PacketCaptureOptions() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::PacketCaptureOptions(ns3::PyViz::PacketCaptureOptions const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::PacketCaptureOptions const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::headers [variable] + cls.add_instance_attribute('headers', 'std::set< ns3::TypeId >', is_const=False) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::mode [variable] + cls.add_instance_attribute('mode', 'ns3::PyViz::PacketCaptureMode', is_const=False) + ## pyviz.h: ns3::PyViz::PacketCaptureOptions::numLastPackets [variable] + cls.add_instance_attribute('numLastPackets', 'uint32_t', is_const=False) + return + +def register_Ns3PyVizPacketDropSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PacketDropSample::PacketDropSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::PacketDropSample::PacketDropSample(ns3::PyViz::PacketDropSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::PacketDropSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PacketDropSample::bytes [variable] + cls.add_instance_attribute('bytes', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::PacketDropSample::transmitter [variable] + cls.add_instance_attribute('transmitter', 'ns3::Ptr< ns3::Node >', is_const=False) + return + +def register_Ns3PyVizPacketSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::PacketSample::PacketSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::PacketSample::PacketSample(ns3::PyViz::PacketSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::PacketSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::PacketSample::device [variable] + cls.add_instance_attribute('device', 'ns3::Ptr< ns3::NetDevice >', is_const=False) + ## pyviz.h: ns3::PyViz::PacketSample::packet [variable] + cls.add_instance_attribute('packet', 'ns3::Ptr< ns3::Packet >', is_const=False) + ## pyviz.h: ns3::PyViz::PacketSample::time [variable] + cls.add_instance_attribute('time', 'ns3::Time', is_const=False) + return + +def register_Ns3PyVizRxPacketSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::RxPacketSample::RxPacketSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::RxPacketSample::RxPacketSample(ns3::PyViz::RxPacketSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::RxPacketSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::RxPacketSample::from [variable] + cls.add_instance_attribute('from', 'ns3::Mac48Address', is_const=False) + return + +def register_Ns3PyVizTransmissionSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::TransmissionSample::TransmissionSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::TransmissionSample::TransmissionSample(ns3::PyViz::TransmissionSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::TransmissionSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::TransmissionSample::bytes [variable] + cls.add_instance_attribute('bytes', 'uint32_t', is_const=False) + ## pyviz.h: ns3::PyViz::TransmissionSample::channel [variable] + cls.add_instance_attribute('channel', 'ns3::Ptr< ns3::Channel >', is_const=False) + ## pyviz.h: ns3::PyViz::TransmissionSample::receiver [variable] + cls.add_instance_attribute('receiver', 'ns3::Ptr< ns3::Node >', is_const=False) + ## pyviz.h: ns3::PyViz::TransmissionSample::transmitter [variable] + cls.add_instance_attribute('transmitter', 'ns3::Ptr< ns3::Node >', is_const=False) + return + +def register_Ns3PyVizTxPacketSample_methods(root_module, cls): + ## pyviz.h: ns3::PyViz::TxPacketSample::TxPacketSample() [constructor] + cls.add_constructor([]) + ## pyviz.h: ns3::PyViz::TxPacketSample::TxPacketSample(ns3::PyViz::TxPacketSample const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PyViz::TxPacketSample const &', 'arg0')]) + ## pyviz.h: ns3::PyViz::TxPacketSample::to [variable] + cls.add_instance_attribute('to', 'ns3::Mac48Address', is_const=False) + return + def register_Ns3Reservation_methods(root_module, cls): ## uan-mac-rc.h: ns3::Reservation::Reservation(ns3::Reservation const & arg0) [copy constructor] cls.add_constructor([param('ns3::Reservation const &', 'arg0')]) @@ -7136,6 +7377,17 @@ def register_functions(root_module): ns3_module_test__local.register_functions(root_module) root_module.end_section('ns3_module_test') + root_module.begin_section('ns3_module_visualizer') + ns3_module_visualizer.register_functions(root_module) + + try: + import ns3_module_visualizer__local + except ImportError: + pass + else: + ns3_module_visualizer__local.register_functions(root_module) + + root_module.end_section('ns3_module_visualizer') root_module.begin_section('ns3_module_mobility') ns3_module_mobility.register_functions(root_module)