From c3c3d4e98f53b4271d0af5d094c81e7c52b52cdb Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 15 Oct 2014 07:34:36 -0700 Subject: [PATCH] rescan stats bindings --- src/stats/bindings/modulegen__gcc_ILP32.py | 47 ++++++++++++++++++---- src/stats/bindings/modulegen__gcc_LP64.py | 47 ++++++++++++++++++---- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/src/stats/bindings/modulegen__gcc_ILP32.py b/src/stats/bindings/modulegen__gcc_ILP32.py index 8254a6e2a..324241f09 100644 --- a/src/stats/bindings/modulegen__gcc_ILP32.py +++ b/src/stats/bindings/modulegen__gcc_ILP32.py @@ -176,6 +176,8 @@ def register_types(module): module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h (module 'stats'): ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) + ## time-probe.h (module 'stats'): ns3::TimeProbe [class] + module.add_class('TimeProbe', parent=root_module['ns3::Probe']) ## time-series-adaptor.h (module 'stats'): ns3::TimeSeriesAdaptor [class] module.add_class('TimeSeriesAdaptor', parent=root_module['ns3::DataCollectionObject']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -330,6 +332,7 @@ def register_methods(root_module): register_Ns3Probe_methods(root_module, root_module['ns3::Probe']) register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) + register_Ns3TimeProbe_methods(root_module, root_module['ns3::TimeProbe']) register_Ns3TimeSeriesAdaptor_methods(root_module, root_module['ns3::TimeSeriesAdaptor']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -499,10 +502,6 @@ def register_Ns3FileHelper_methods(root_module, cls): cls.add_method('AddAggregator', 'void', [param('std::string const &', 'aggregatorName'), param('std::string const &', 'outputFileName'), param('bool', 'onlyOneAggregator')]) - ## file-helper.h (module 'stats'): void ns3::FileHelper::AddProbe(std::string const & typeId, std::string const & probeName, std::string const & path) [member function] - cls.add_method('AddProbe', - 'void', - [param('std::string const &', 'typeId'), param('std::string const &', 'probeName'), param('std::string const &', 'path')]) ## file-helper.h (module 'stats'): void ns3::FileHelper::AddTimeSeriesAdaptor(std::string const & adaptorName) [member function] cls.add_method('AddTimeSeriesAdaptor', 'void', @@ -681,10 +680,6 @@ def register_Ns3GnuplotHelper_methods(root_module, cls): cls.add_constructor([]) ## gnuplot-helper.h (module 'stats'): ns3::GnuplotHelper::GnuplotHelper(std::string const & outputFileNameWithoutExtension, std::string const & title, std::string const & xLegend, std::string const & yLegend, std::string const & terminalType="png") [constructor] cls.add_constructor([param('std::string const &', 'outputFileNameWithoutExtension'), param('std::string const &', 'title'), param('std::string const &', 'xLegend'), param('std::string const &', 'yLegend'), param('std::string const &', 'terminalType', default_value='"png"')]) - ## gnuplot-helper.h (module 'stats'): void ns3::GnuplotHelper::AddProbe(std::string const & typeId, std::string const & probeName, std::string const & path) [member function] - cls.add_method('AddProbe', - 'void', - [param('std::string const &', 'typeId'), param('std::string const &', 'probeName'), param('std::string const &', 'path')]) ## gnuplot-helper.h (module 'stats'): void ns3::GnuplotHelper::AddTimeSeriesAdaptor(std::string const & adaptorName) [member function] cls.add_method('AddTimeSeriesAdaptor', 'void', @@ -2831,6 +2826,42 @@ def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return +def register_Ns3TimeProbe_methods(root_module, cls): + ## time-probe.h (module 'stats'): ns3::TimeProbe::TimeProbe(ns3::TimeProbe const & arg0) [copy constructor] + cls.add_constructor([param('ns3::TimeProbe const &', 'arg0')]) + ## time-probe.h (module 'stats'): ns3::TimeProbe::TimeProbe() [constructor] + cls.add_constructor([]) + ## time-probe.h (module 'stats'): bool ns3::TimeProbe::ConnectByObject(std::string traceSource, ns3::Ptr obj) [member function] + cls.add_method('ConnectByObject', + 'bool', + [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], + is_virtual=True) + ## time-probe.h (module 'stats'): void ns3::TimeProbe::ConnectByPath(std::string path) [member function] + cls.add_method('ConnectByPath', + 'void', + [param('std::string', 'path')], + is_virtual=True) + ## time-probe.h (module 'stats'): static ns3::TypeId ns3::TimeProbe::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## time-probe.h (module 'stats'): double ns3::TimeProbe::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## time-probe.h (module 'stats'): void ns3::TimeProbe::SetValue(ns3::Time value) [member function] + cls.add_method('SetValue', + 'void', + [param('ns3::Time', 'value')]) + ## time-probe.h (module 'stats'): static void ns3::TimeProbe::SetValueByPath(std::string path, ns3::Time value) [member function] + cls.add_method('SetValueByPath', + 'void', + [param('std::string', 'path'), param('ns3::Time', 'value')], + is_static=True) + return + def register_Ns3TimeSeriesAdaptor_methods(root_module, cls): ## time-series-adaptor.h (module 'stats'): ns3::TimeSeriesAdaptor::TimeSeriesAdaptor(ns3::TimeSeriesAdaptor const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeSeriesAdaptor const &', 'arg0')]) diff --git a/src/stats/bindings/modulegen__gcc_LP64.py b/src/stats/bindings/modulegen__gcc_LP64.py index 8254a6e2a..324241f09 100644 --- a/src/stats/bindings/modulegen__gcc_LP64.py +++ b/src/stats/bindings/modulegen__gcc_LP64.py @@ -176,6 +176,8 @@ def register_types(module): module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h (module 'stats'): ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) + ## time-probe.h (module 'stats'): ns3::TimeProbe [class] + module.add_class('TimeProbe', parent=root_module['ns3::Probe']) ## time-series-adaptor.h (module 'stats'): ns3::TimeSeriesAdaptor [class] module.add_class('TimeSeriesAdaptor', parent=root_module['ns3::DataCollectionObject']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -330,6 +332,7 @@ def register_methods(root_module): register_Ns3Probe_methods(root_module, root_module['ns3::Probe']) register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) + register_Ns3TimeProbe_methods(root_module, root_module['ns3::TimeProbe']) register_Ns3TimeSeriesAdaptor_methods(root_module, root_module['ns3::TimeSeriesAdaptor']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -499,10 +502,6 @@ def register_Ns3FileHelper_methods(root_module, cls): cls.add_method('AddAggregator', 'void', [param('std::string const &', 'aggregatorName'), param('std::string const &', 'outputFileName'), param('bool', 'onlyOneAggregator')]) - ## file-helper.h (module 'stats'): void ns3::FileHelper::AddProbe(std::string const & typeId, std::string const & probeName, std::string const & path) [member function] - cls.add_method('AddProbe', - 'void', - [param('std::string const &', 'typeId'), param('std::string const &', 'probeName'), param('std::string const &', 'path')]) ## file-helper.h (module 'stats'): void ns3::FileHelper::AddTimeSeriesAdaptor(std::string const & adaptorName) [member function] cls.add_method('AddTimeSeriesAdaptor', 'void', @@ -681,10 +680,6 @@ def register_Ns3GnuplotHelper_methods(root_module, cls): cls.add_constructor([]) ## gnuplot-helper.h (module 'stats'): ns3::GnuplotHelper::GnuplotHelper(std::string const & outputFileNameWithoutExtension, std::string const & title, std::string const & xLegend, std::string const & yLegend, std::string const & terminalType="png") [constructor] cls.add_constructor([param('std::string const &', 'outputFileNameWithoutExtension'), param('std::string const &', 'title'), param('std::string const &', 'xLegend'), param('std::string const &', 'yLegend'), param('std::string const &', 'terminalType', default_value='"png"')]) - ## gnuplot-helper.h (module 'stats'): void ns3::GnuplotHelper::AddProbe(std::string const & typeId, std::string const & probeName, std::string const & path) [member function] - cls.add_method('AddProbe', - 'void', - [param('std::string const &', 'typeId'), param('std::string const &', 'probeName'), param('std::string const &', 'path')]) ## gnuplot-helper.h (module 'stats'): void ns3::GnuplotHelper::AddTimeSeriesAdaptor(std::string const & adaptorName) [member function] cls.add_method('AddTimeSeriesAdaptor', 'void', @@ -2831,6 +2826,42 @@ def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return +def register_Ns3TimeProbe_methods(root_module, cls): + ## time-probe.h (module 'stats'): ns3::TimeProbe::TimeProbe(ns3::TimeProbe const & arg0) [copy constructor] + cls.add_constructor([param('ns3::TimeProbe const &', 'arg0')]) + ## time-probe.h (module 'stats'): ns3::TimeProbe::TimeProbe() [constructor] + cls.add_constructor([]) + ## time-probe.h (module 'stats'): bool ns3::TimeProbe::ConnectByObject(std::string traceSource, ns3::Ptr obj) [member function] + cls.add_method('ConnectByObject', + 'bool', + [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], + is_virtual=True) + ## time-probe.h (module 'stats'): void ns3::TimeProbe::ConnectByPath(std::string path) [member function] + cls.add_method('ConnectByPath', + 'void', + [param('std::string', 'path')], + is_virtual=True) + ## time-probe.h (module 'stats'): static ns3::TypeId ns3::TimeProbe::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## time-probe.h (module 'stats'): double ns3::TimeProbe::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## time-probe.h (module 'stats'): void ns3::TimeProbe::SetValue(ns3::Time value) [member function] + cls.add_method('SetValue', + 'void', + [param('ns3::Time', 'value')]) + ## time-probe.h (module 'stats'): static void ns3::TimeProbe::SetValueByPath(std::string path, ns3::Time value) [member function] + cls.add_method('SetValueByPath', + 'void', + [param('std::string', 'path'), param('ns3::Time', 'value')], + is_static=True) + return + def register_Ns3TimeSeriesAdaptor_methods(root_module, cls): ## time-series-adaptor.h (module 'stats'): ns3::TimeSeriesAdaptor::TimeSeriesAdaptor(ns3::TimeSeriesAdaptor const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeSeriesAdaptor const &', 'arg0')])