From 175ac1f10a1869571294ba127ccc14c9782270fb Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Tue, 23 Feb 2010 10:30:38 -0800 Subject: [PATCH] OutputStreamKeeper to OutputStreamWrapper --HG-- rename : src/common/output-stream-keeper.cc => src/common/output-stream-wrapper.cc rename : src/common/output-stream-keeper.h => src/common/output-stream-wrapper.h --- .../apidefs/gcc-ILP32/ns3_module_common.py | 24 +-- .../apidefs/gcc-ILP32/ns3_module_core.py | 24 +-- .../apidefs/gcc-ILP32/ns3_module_helper.py | 144 +++++++------- .../apidefs/gcc-LP64/ns3_module_common.py | 24 +-- .../apidefs/gcc-LP64/ns3_module_core.py | 24 +-- .../apidefs/gcc-LP64/ns3_module_helper.py | 144 +++++++------- doc/manual/tracing.texi | 44 ++--- doc/tutorial/tracing.texi | 68 +++---- examples/routing/dynamic-global-routing.cc | 2 +- examples/routing/mixed-global-routing.cc | 2 +- examples/tutorial/sixth.cc | 4 +- examples/wireless/mixed-wireless.cc | 2 +- ...eam-keeper.cc => output-stream-wrapper.cc} | 12 +- ...tream-keeper.h => output-stream-wrapper.h} | 18 +- src/common/wscript | 4 +- src/helper/csma-helper.cc | 8 +- src/helper/csma-helper.h | 2 +- src/helper/emu-helper.cc | 8 +- src/helper/emu-helper.h | 2 +- src/helper/internet-stack-helper.cc | 28 +-- src/helper/internet-stack-helper.h | 8 +- src/helper/point-to-point-helper.cc | 8 +- src/helper/point-to-point-helper.h | 2 +- src/helper/trace-helper.cc | 120 ++++++------ src/helper/trace-helper.h | 178 +++++++++--------- src/helper/yans-wifi-helper.cc | 16 +- src/helper/yans-wifi-helper.h | 2 +- 27 files changed, 461 insertions(+), 461 deletions(-) rename src/common/{output-stream-keeper.cc => output-stream-wrapper.cc} (78%) rename src/common/{output-stream-keeper.h => output-stream-wrapper.h} (87%) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py index fa28aa619..90f95980d 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py @@ -57,8 +57,8 @@ def register_types(module): module.add_class('RandomPropagationDelayModel', parent=root_module['ns3::PropagationDelayModel']) ## propagation-loss-model.h: ns3::RandomPropagationLossModel [class] module.add_class('RandomPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) - ## simple-ref-count.h: ns3::SimpleRefCount > [class] - module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::OutputStreamKeeper', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h: ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::OutputStreamWrapper', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h: ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## propagation-loss-model.h: ns3::ThreeLogDistancePropagationLossModel [class] @@ -89,8 +89,8 @@ def register_types(module): module.add_class('NakagamiPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## nix-vector.h: ns3::NixVector [class] module.add_class('NixVector', parent=root_module['ns3::Object']) - ## output-stream-keeper.h: ns3::OutputStreamKeeper [class] - module.add_class('OutputStreamKeeper', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamKeeper, ns3::empty, ns3::DefaultDeleter >']) + ## output-stream-wrapper.h: ns3::OutputStreamWrapper [class] + module.add_class('OutputStreamWrapper', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h: ns3::Packet [class] module.add_class('Packet', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## error-model.h: ns3::RateErrorModel [class] @@ -216,7 +216,7 @@ def register_methods(root_module): register_Ns3LogDistancePropagationLossModel_methods(root_module, root_module['ns3::LogDistancePropagationLossModel']) register_Ns3NakagamiPropagationLossModel_methods(root_module, root_module['ns3::NakagamiPropagationLossModel']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) - register_Ns3OutputStreamKeeper_methods(root_module, root_module['ns3::OutputStreamKeeper']) + register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) return @@ -1557,21 +1557,21 @@ def register_Ns3NixVector_methods(root_module, cls): is_const=True) return -def register_Ns3OutputStreamKeeper_methods(root_module, cls): - ## output-stream-keeper.h: ns3::OutputStreamKeeper::OutputStreamKeeper(ns3::OutputStreamKeeper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::OutputStreamKeeper const &', 'arg0')]) - ## output-stream-keeper.h: ns3::OutputStreamKeeper::OutputStreamKeeper() [constructor] +def register_Ns3OutputStreamWrapper_methods(root_module, cls): + ## output-stream-wrapper.h: ns3::OutputStreamWrapper::OutputStreamWrapper(ns3::OutputStreamWrapper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::OutputStreamWrapper const &', 'arg0')]) + ## output-stream-wrapper.h: ns3::OutputStreamWrapper::OutputStreamWrapper() [constructor] cls.add_constructor([]) - ## output-stream-keeper.h: std::ostream * ns3::OutputStreamKeeper::GetStream() [member function] + ## output-stream-wrapper.h: std::ostream * ns3::OutputStreamWrapper::GetStream() [member function] cls.add_method('GetStream', 'std::ostream *', []) - ## output-stream-keeper.h: static ns3::TypeId ns3::OutputStreamKeeper::GetTypeId() [member function] + ## output-stream-wrapper.h: static ns3::TypeId ns3::OutputStreamWrapper::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) - ## output-stream-keeper.h: void ns3::OutputStreamKeeper::SetStream(std::ostream * ostream) [member function] + ## output-stream-wrapper.h: void ns3::OutputStreamWrapper::SetStream(std::ostream * ostream) [member function] cls.add_method('SetStream', 'void', [param('std::ostream *', 'ostream')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py index ba78b57a7..218aa3112 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py @@ -381,7 +381,7 @@ def register_methods(root_module): register_Ns3SimpleRefCount__Ns3Ipv6MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv6MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv6MulticastRoute, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Ipv6Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv6Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv6Route, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3MeshWifiInterfaceMacPlugin_Ns3Empty_Ns3DefaultDeleter__lt__ns3MeshWifiInterfaceMacPlugin__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::MeshWifiInterfaceMacPlugin, ns3::empty, ns3::DefaultDeleter >']) - register_Ns3SimpleRefCount__Ns3OutputStreamKeeper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamKeeper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamKeeper, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3PbbAddressBlock_Ns3Empty_Ns3DefaultDeleter__lt__ns3PbbAddressBlock__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::PbbAddressBlock, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3PbbMessage_Ns3Empty_Ns3DefaultDeleter__lt__ns3PbbMessage__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::PbbMessage, ns3::empty, ns3::DefaultDeleter >']) @@ -1948,12 +1948,12 @@ def register_Ns3SimpleRefCount__Ns3MeshWifiInterfaceMacPlugin_Ns3Empty_Ns3Defaul is_static=True) return -def register_Ns3SimpleRefCount__Ns3OutputStreamKeeper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamKeeper__gt___methods(root_module, cls): - ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount() [constructor] +def register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, cls): + ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) - ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] - cls.add_constructor([param('ns3::SimpleRefCount< ns3::OutputStreamKeeper, ns3::empty, ns3::DefaultDeleter< ns3::OutputStreamKeeper > > const &', 'o')]) - ## simple-ref-count.h: static void ns3::SimpleRefCount >::Cleanup() [member function] + ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter< ns3::OutputStreamWrapper > > const &', 'o')]) + ## simple-ref-count.h: static void ns3::SimpleRefCount >::Cleanup() [member function] cls.add_method('Cleanup', 'void', [], @@ -3055,21 +3055,21 @@ def register_functions(root_module): module.add_function('MakeBooleanChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## callback.h: extern ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] + ## callback.h: extern ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] module.add_function('MakeBoundCallback', 'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', - [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamKeeper >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamKeeper >', 'a')], - template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ptr']) + [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamWrapper >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'a')], + template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ptr']) ## callback.h: extern ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] module.add_function('MakeBoundCallback', 'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', [param('void ( * ) ( ns3::Ptr< ns3::PcapFileWrapper >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::PcapFileWrapper >', 'a')], template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ptr']) - ## callback.h: extern ns3::Callback, std::allocator >,ns3::Ptr,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::std::basic_string,std::allocator >,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] + ## callback.h: extern ns3::Callback, std::allocator >,ns3::Ptr,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::std::basic_string,std::allocator >,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] module.add_function('MakeBoundCallback', 'ns3::Callback< void, std::basic_string< char, std::char_traits< char >, std::allocator< char > >, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', - [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamKeeper >, std::string, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamKeeper >', 'a')], - template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'std::string', 'ns3::Ptr']) + [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamWrapper >, std::string, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'a')], + template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'std::string', 'ns3::Ptr']) ## callback.h: extern ns3::Ptr ns3::MakeCallbackChecker() [free function] module.add_function('MakeCallbackChecker', 'ns3::Ptr< ns3::AttributeChecker const >', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py index 2b7ebbb29..293a2915f 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py @@ -361,49 +361,49 @@ def register_Ns3AsciiTraceHelper_methods(root_module, cls): cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')]) ## trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor] cls.add_constructor([]) - ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function] + ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function] cls.add_method('CreateFileStream', - 'ns3::Ptr< ns3::OutputStreamKeeper >', + 'ns3::Ptr< ns3::OutputStreamWrapper >', [param('std::string', 'filename'), param('std::string', 'filemode', default_value='"w"')]) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultDequeueSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultDequeueSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultDropSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultDropSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultEnqueueSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultEnqueueSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultReceiveSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultReceiveSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) ## trace-helper.h: std::string ns3::AsciiTraceHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr device, bool useObjectNames=true) [member function] cls.add_method('GetFilenameFromDevice', @@ -424,54 +424,54 @@ def register_Ns3AsciiTraceHelperForDevice_methods(root_module, cls): cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::Ptr nd) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::Ptr nd) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, std::string ndName) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('std::string', 'ndName')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, std::string ndName) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, std::string ndName) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'ndName')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ndName')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NetDeviceContainer d) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NetDeviceContainer d) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NetDeviceContainer d) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NetDeviceContainer', 'd')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NetDeviceContainer', 'd')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NodeContainer n) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NodeContainer n) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NodeContainer', 'n')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, uint32_t nodeid, uint32_t deviceid) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(std::string prefix) [member function] cls.add_method('EnableAsciiAll', 'void', [param('std::string', 'prefix')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(ns3::Ptr stream) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(ns3::Ptr stream) [member function] cls.add_method('EnableAsciiAll', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')]) + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], is_pure_virtual=True, is_virtual=True) return @@ -484,54 +484,54 @@ def register_Ns3AsciiTraceHelperForIpv4_methods(root_module, cls): cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ptr ipv4, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, std::string ipv4Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, std::string ipv4Name, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, std::string ipv4Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, ns3::Ipv4InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('ns3::Ipv4InterfaceContainer', 'c')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ipv4InterfaceContainer c) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ipv4InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ipv4InterfaceContainer', 'c')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ipv4InterfaceContainer', 'c')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::NodeContainer n) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NodeContainer', 'n')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4All(std::string prefix) [member function] cls.add_method('EnableAsciiIpv4All', 'void', [param('std::string', 'prefix')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4All(ns3::Ptr stream) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4All(ns3::Ptr stream) [member function] cls.add_method('EnableAsciiIpv4All', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')]) + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) return @@ -544,54 +544,54 @@ def register_Ns3AsciiTraceHelperForIpv6_methods(root_module, cls): cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ptr ipv6, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ptr ipv6, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, std::string ipv6Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('std::string', 'ipv6Name'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, std::string ipv6Name, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, std::string ipv6Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'ipv6Name'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ipv6Name'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, ns3::Ipv6InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('ns3::Ipv6InterfaceContainer', 'c')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ipv6InterfaceContainer c) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ipv6InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ipv6InterfaceContainer', 'c')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ipv6InterfaceContainer', 'c')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::NodeContainer n) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NodeContainer', 'n')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6All(std::string prefix) [member function] cls.add_method('EnableAsciiIpv6All', 'void', [param('std::string', 'prefix')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6All(ns3::Ptr stream) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6All(ns3::Ptr stream) [member function] cls.add_method('EnableAsciiIpv6All', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')]) + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) return @@ -1612,10 +1612,10 @@ def register_Ns3PointToPointHelper_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')]) - ## point-to-point-helper.h: void ns3::PointToPointHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## point-to-point-helper.h: void ns3::PointToPointHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## point-to-point-helper.h: void ns3::PointToPointHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous=false) [member function] cls.add_method('EnablePcapInternal', @@ -1970,10 +1970,10 @@ def register_Ns3YansWifiPhyHelper_methods(root_module, cls): 'ns3::Ptr< ns3::WifiPhy >', [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::WifiNetDevice >', 'device')], is_const=True, visibility='private', is_virtual=True) - ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous) [member function] cls.add_method('EnablePcapInternal', @@ -2065,10 +2065,10 @@ def register_Ns3CsmaHelper_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')]) - ## csma-helper.h: void ns3::CsmaHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## csma-helper.h: void ns3::CsmaHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## csma-helper.h: void ns3::CsmaHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous=false) [member function] cls.add_method('EnablePcapInternal', @@ -2105,10 +2105,10 @@ def register_Ns3EmuHelper_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')]) - ## emu-helper.h: void ns3::EmuHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## emu-helper.h: void ns3::EmuHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## emu-helper.h: void ns3::EmuHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous=false) [member function] cls.add_method('EnablePcapInternal', @@ -2170,15 +2170,15 @@ def register_Ns3InternetStackHelper_methods(root_module, cls): cls.add_method('SetTcp', 'void', [param('std::string', 'tid'), param('std::string', 'attr'), param('ns3::AttributeValue const &', 'val')]) - ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] + ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], visibility='private', is_virtual=True) - ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] + ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], visibility='private', is_virtual=True) ## internet-stack-helper.h: void ns3::InternetStackHelper::EnablePcapIpv4Internal(std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnablePcapIpv4Internal', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py index fa28aa619..90f95980d 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py @@ -57,8 +57,8 @@ def register_types(module): module.add_class('RandomPropagationDelayModel', parent=root_module['ns3::PropagationDelayModel']) ## propagation-loss-model.h: ns3::RandomPropagationLossModel [class] module.add_class('RandomPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) - ## simple-ref-count.h: ns3::SimpleRefCount > [class] - module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::OutputStreamKeeper', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h: ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::OutputStreamWrapper', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h: ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## propagation-loss-model.h: ns3::ThreeLogDistancePropagationLossModel [class] @@ -89,8 +89,8 @@ def register_types(module): module.add_class('NakagamiPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## nix-vector.h: ns3::NixVector [class] module.add_class('NixVector', parent=root_module['ns3::Object']) - ## output-stream-keeper.h: ns3::OutputStreamKeeper [class] - module.add_class('OutputStreamKeeper', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamKeeper, ns3::empty, ns3::DefaultDeleter >']) + ## output-stream-wrapper.h: ns3::OutputStreamWrapper [class] + module.add_class('OutputStreamWrapper', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h: ns3::Packet [class] module.add_class('Packet', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## error-model.h: ns3::RateErrorModel [class] @@ -216,7 +216,7 @@ def register_methods(root_module): register_Ns3LogDistancePropagationLossModel_methods(root_module, root_module['ns3::LogDistancePropagationLossModel']) register_Ns3NakagamiPropagationLossModel_methods(root_module, root_module['ns3::NakagamiPropagationLossModel']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) - register_Ns3OutputStreamKeeper_methods(root_module, root_module['ns3::OutputStreamKeeper']) + register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) return @@ -1557,21 +1557,21 @@ def register_Ns3NixVector_methods(root_module, cls): is_const=True) return -def register_Ns3OutputStreamKeeper_methods(root_module, cls): - ## output-stream-keeper.h: ns3::OutputStreamKeeper::OutputStreamKeeper(ns3::OutputStreamKeeper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::OutputStreamKeeper const &', 'arg0')]) - ## output-stream-keeper.h: ns3::OutputStreamKeeper::OutputStreamKeeper() [constructor] +def register_Ns3OutputStreamWrapper_methods(root_module, cls): + ## output-stream-wrapper.h: ns3::OutputStreamWrapper::OutputStreamWrapper(ns3::OutputStreamWrapper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::OutputStreamWrapper const &', 'arg0')]) + ## output-stream-wrapper.h: ns3::OutputStreamWrapper::OutputStreamWrapper() [constructor] cls.add_constructor([]) - ## output-stream-keeper.h: std::ostream * ns3::OutputStreamKeeper::GetStream() [member function] + ## output-stream-wrapper.h: std::ostream * ns3::OutputStreamWrapper::GetStream() [member function] cls.add_method('GetStream', 'std::ostream *', []) - ## output-stream-keeper.h: static ns3::TypeId ns3::OutputStreamKeeper::GetTypeId() [member function] + ## output-stream-wrapper.h: static ns3::TypeId ns3::OutputStreamWrapper::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) - ## output-stream-keeper.h: void ns3::OutputStreamKeeper::SetStream(std::ostream * ostream) [member function] + ## output-stream-wrapper.h: void ns3::OutputStreamWrapper::SetStream(std::ostream * ostream) [member function] cls.add_method('SetStream', 'void', [param('std::ostream *', 'ostream')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py index 06068d71c..d2841470f 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py @@ -381,7 +381,7 @@ def register_methods(root_module): register_Ns3SimpleRefCount__Ns3Ipv6MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv6MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv6MulticastRoute, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Ipv6Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv6Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv6Route, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3MeshWifiInterfaceMacPlugin_Ns3Empty_Ns3DefaultDeleter__lt__ns3MeshWifiInterfaceMacPlugin__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::MeshWifiInterfaceMacPlugin, ns3::empty, ns3::DefaultDeleter >']) - register_Ns3SimpleRefCount__Ns3OutputStreamKeeper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamKeeper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamKeeper, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3PbbAddressBlock_Ns3Empty_Ns3DefaultDeleter__lt__ns3PbbAddressBlock__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::PbbAddressBlock, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3PbbMessage_Ns3Empty_Ns3DefaultDeleter__lt__ns3PbbMessage__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::PbbMessage, ns3::empty, ns3::DefaultDeleter >']) @@ -1948,12 +1948,12 @@ def register_Ns3SimpleRefCount__Ns3MeshWifiInterfaceMacPlugin_Ns3Empty_Ns3Defaul is_static=True) return -def register_Ns3SimpleRefCount__Ns3OutputStreamKeeper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamKeeper__gt___methods(root_module, cls): - ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount() [constructor] +def register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, cls): + ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) - ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] - cls.add_constructor([param('ns3::SimpleRefCount< ns3::OutputStreamKeeper, ns3::empty, ns3::DefaultDeleter< ns3::OutputStreamKeeper > > const &', 'o')]) - ## simple-ref-count.h: static void ns3::SimpleRefCount >::Cleanup() [member function] + ## simple-ref-count.h: ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter< ns3::OutputStreamWrapper > > const &', 'o')]) + ## simple-ref-count.h: static void ns3::SimpleRefCount >::Cleanup() [member function] cls.add_method('Cleanup', 'void', [], @@ -3055,21 +3055,21 @@ def register_functions(root_module): module.add_function('MakeBooleanChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## callback.h: extern ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] + ## callback.h: extern ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] module.add_function('MakeBoundCallback', 'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', - [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamKeeper >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamKeeper >', 'a')], - template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ptr']) + [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamWrapper >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'a')], + template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ptr']) ## callback.h: extern ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] module.add_function('MakeBoundCallback', 'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', [param('void ( * ) ( ns3::Ptr< ns3::PcapFileWrapper >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::PcapFileWrapper >', 'a')], template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ptr']) - ## callback.h: extern ns3::Callback, std::allocator >,ns3::Ptr,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::std::basic_string,std::allocator >,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] + ## callback.h: extern ns3::Callback, std::allocator >,ns3::Ptr,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr,::std::basic_string,std::allocator >,::ns3::Ptr ) * fnPtr, ns3::Ptr a) [free function] module.add_function('MakeBoundCallback', 'ns3::Callback< void, std::basic_string< char, std::char_traits< char >, std::allocator< char > >, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', - [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamKeeper >, std::string, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamKeeper >', 'a')], - template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'std::string', 'ns3::Ptr']) + [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamWrapper >, std::string, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'a')], + template_parameters=['void', 'ns3::Ptr', 'ns3::Ptr', 'std::string', 'ns3::Ptr']) ## callback.h: extern ns3::Ptr ns3::MakeCallbackChecker() [free function] module.add_function('MakeCallbackChecker', 'ns3::Ptr< ns3::AttributeChecker const >', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py index 2b7ebbb29..293a2915f 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py @@ -361,49 +361,49 @@ def register_Ns3AsciiTraceHelper_methods(root_module, cls): cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')]) ## trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor] cls.add_constructor([]) - ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function] + ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function] cls.add_method('CreateFileStream', - 'ns3::Ptr< ns3::OutputStreamKeeper >', + 'ns3::Ptr< ns3::OutputStreamWrapper >', [param('std::string', 'filename'), param('std::string', 'filemode', default_value='"w"')]) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultDequeueSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultDequeueSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultDropSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultDropSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultEnqueueSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultEnqueueSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultReceiveSinkWithContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) - ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] + ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr file, ns3::Ptr p) [member function] cls.add_method('DefaultReceiveSinkWithoutContext', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], is_static=True) ## trace-helper.h: std::string ns3::AsciiTraceHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr device, bool useObjectNames=true) [member function] cls.add_method('GetFilenameFromDevice', @@ -424,54 +424,54 @@ def register_Ns3AsciiTraceHelperForDevice_methods(root_module, cls): cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::Ptr nd) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::Ptr nd) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, std::string ndName) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('std::string', 'ndName')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, std::string ndName) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, std::string ndName) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'ndName')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ndName')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NetDeviceContainer d) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NetDeviceContainer d) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NetDeviceContainer d) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NetDeviceContainer', 'd')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NetDeviceContainer', 'd')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NodeContainer n) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, ns3::NodeContainer n) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NodeContainer', 'n')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAscii', 'void', [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, uint32_t nodeid, uint32_t deviceid) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAscii(ns3::Ptr stream, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAscii', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(std::string prefix) [member function] cls.add_method('EnableAsciiAll', 'void', [param('std::string', 'prefix')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(ns3::Ptr stream) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiAll(ns3::Ptr stream) [member function] cls.add_method('EnableAsciiAll', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')]) + ## trace-helper.h: void ns3::AsciiTraceHelperForDevice::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], is_pure_virtual=True, is_virtual=True) return @@ -484,54 +484,54 @@ def register_Ns3AsciiTraceHelperForIpv4_methods(root_module, cls): cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ptr ipv4, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, std::string ipv4Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, std::string ipv4Name, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, std::string ipv4Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, ns3::Ipv4InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('ns3::Ipv4InterfaceContainer', 'c')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ipv4InterfaceContainer c) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::Ipv4InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ipv4InterfaceContainer', 'c')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ipv4InterfaceContainer', 'c')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::NodeContainer n) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NodeContainer', 'n')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAsciiIpv4', 'void', [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4All(std::string prefix) [member function] cls.add_method('EnableAsciiIpv4All', 'void', [param('std::string', 'prefix')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4All(ns3::Ptr stream) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4All(ns3::Ptr stream) [member function] cls.add_method('EnableAsciiIpv4All', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')]) + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv4::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) return @@ -544,54 +544,54 @@ def register_Ns3AsciiTraceHelperForIpv6_methods(root_module, cls): cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ptr ipv6, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ptr ipv6, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, std::string ipv6Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('std::string', 'ipv6Name'), param('uint32_t', 'interface')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, std::string ipv6Name, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, std::string ipv6Name, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'ipv6Name'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'ipv6Name'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, ns3::Ipv6InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('ns3::Ipv6InterfaceContainer', 'c')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ipv6InterfaceContainer c) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::Ipv6InterfaceContainer c) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::Ipv6InterfaceContainer', 'c')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::Ipv6InterfaceContainer', 'c')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::NodeContainer n) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, ns3::NodeContainer n) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('ns3::NodeContainer', 'n')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('ns3::NodeContainer', 'n')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function] cls.add_method('EnableAsciiIpv6', 'void', [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6(ns3::Ptr stream, uint32_t nodeid, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')]) ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6All(std::string prefix) [member function] cls.add_method('EnableAsciiIpv6All', 'void', [param('std::string', 'prefix')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6All(ns3::Ptr stream) [member function] + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6All(ns3::Ptr stream) [member function] cls.add_method('EnableAsciiIpv6All', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream')]) - ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')]) + ## trace-helper.h: void ns3::AsciiTraceHelperForIpv6::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) return @@ -1612,10 +1612,10 @@ def register_Ns3PointToPointHelper_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')]) - ## point-to-point-helper.h: void ns3::PointToPointHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## point-to-point-helper.h: void ns3::PointToPointHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## point-to-point-helper.h: void ns3::PointToPointHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous=false) [member function] cls.add_method('EnablePcapInternal', @@ -1970,10 +1970,10 @@ def register_Ns3YansWifiPhyHelper_methods(root_module, cls): 'ns3::Ptr< ns3::WifiPhy >', [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::WifiNetDevice >', 'device')], is_const=True, visibility='private', is_virtual=True) - ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous) [member function] cls.add_method('EnablePcapInternal', @@ -2065,10 +2065,10 @@ def register_Ns3CsmaHelper_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')]) - ## csma-helper.h: void ns3::CsmaHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## csma-helper.h: void ns3::CsmaHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## csma-helper.h: void ns3::CsmaHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous=false) [member function] cls.add_method('EnablePcapInternal', @@ -2105,10 +2105,10 @@ def register_Ns3EmuHelper_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')]) - ## emu-helper.h: void ns3::EmuHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] + ## emu-helper.h: void ns3::EmuHelper::EnableAsciiInternal(ns3::Ptr stream, std::string prefix, ns3::Ptr nd) [member function] cls.add_method('EnableAsciiInternal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')], visibility='private', is_virtual=True) ## emu-helper.h: void ns3::EmuHelper::EnablePcapInternal(std::string prefix, ns3::Ptr nd, bool promiscuous=false) [member function] cls.add_method('EnablePcapInternal', @@ -2170,15 +2170,15 @@ def register_Ns3InternetStackHelper_methods(root_module, cls): cls.add_method('SetTcp', 'void', [param('std::string', 'tid'), param('std::string', 'attr'), param('ns3::AttributeValue const &', 'val')]) - ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] + ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv4Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv4Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], visibility='private', is_virtual=True) - ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] + ## internet-stack-helper.h: void ns3::InternetStackHelper::EnableAsciiIpv6Internal(ns3::Ptr stream, std::string prefix, ns3::Ptr ipv6, uint32_t interface) [member function] cls.add_method('EnableAsciiIpv6Internal', 'void', - [param('ns3::Ptr< ns3::OutputStreamKeeper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], visibility='private', is_virtual=True) ## internet-stack-helper.h: void ns3::InternetStackHelper::EnablePcapIpv4Internal(std::string prefix, ns3::Ptr ipv4, uint32_t interface) [member function] cls.add_method('EnablePcapIpv4Internal', diff --git a/doc/manual/tracing.texi b/doc/manual/tracing.texi index b99c0234b..bb29fe6ee 100644 --- a/doc/manual/tracing.texi +++ b/doc/manual/tracing.texi @@ -561,7 +561,7 @@ also implement a single virtual method inherited from the ascii trace additions to this class. @verbatim - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) = 0; + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) = 0; @end verbatim The signature of this method reflects the device-centric view of the situation @@ -573,7 +573,7 @@ methods, @verbatim void EnableAscii (std::string prefix, Ptr nd); - void EnableAscii (Ptr stream, Ptr nd); + void EnableAscii (Ptr stream, Ptr nd); @verbatim will call the device implementation of @code{EnableAsciiInternal} directly, @@ -588,22 +588,22 @@ will all work in the same way across devices if the devices implement @verbatim void EnableAscii (std::string prefix, Ptr nd); - void EnableAscii (Ptr stream, Ptr nd); + void EnableAscii (Ptr stream, Ptr nd); void EnableAscii (std::string prefix, std::string ndName); - void EnableAscii (Ptr stream, std::string ndName); + void EnableAscii (Ptr stream, std::string ndName); void EnableAscii (std::string prefix, NetDeviceContainer d); - void EnableAscii (Ptr stream, NetDeviceContainer d); + void EnableAscii (Ptr stream, NetDeviceContainer d); void EnableAscii (std::string prefix, NodeContainer n); - void EnableAscii (Ptr stream, NodeContainer n); + void EnableAscii (Ptr stream, NodeContainer n); void EnableAscii (std::string prefix, uint32_t nodeid, uint32_t deviceid); - void EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid); + void EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid); void EnableAsciiAll (std::string prefix); - void EnableAsciiAll (Ptr stream); + void EnableAsciiAll (Ptr stream); @end verbatim You are encouraged to peruse the Doxygen for class @code{TraceHelperForDevice} @@ -642,7 +642,7 @@ above: Ptr nd1; Ptr nd2; ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAscii (stream, nd1); helper.EnableAscii (stream, nd2); @@ -680,7 +680,7 @@ you can use that form as well: Names::Add ("server" ...); Names::Add ("server/eth0" ...); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAscii (stream, "client/eth0"); helper.EnableAscii (stream, "server/eth0"); @@ -710,7 +710,7 @@ traces into a single file is accomplished similarly to the examples above: @verbatim NetDeviceContainer d = ...; ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAscii (stream, d); @end verbatim @@ -946,7 +946,7 @@ for using ascii tracing to the PcapHelperForIpv4. Every protocol must additionally implement a single virtual method inherited from this class. @verbatim - virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, + virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface) = 0; @end verbatim @@ -959,7 +959,7 @@ methods, @verbatim void EnableAsciiIpv4 (std::string prefix, Ptr ipv4, uint32_t interface); - void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); @verbatim will call the device implementation of @code{EnableAsciiIpv4Internal} directly, @@ -974,22 +974,22 @@ will all work in the same way across protocols if the protocols implement @verbatim void EnableAsciiIpv4 (std::string prefix, Ptr ipv4, uint32_t interface); - void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); void EnableAsciiIpv4 (std::string prefix, std::string ipv4Name, uint32_t interface); - void EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface); void EnableAsciiIpv4 (std::string prefix, Ipv4InterfaceContainer c); - void EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c); + void EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c); void EnableAsciiIpv4 (std::string prefix, NodeContainer n); - void EnableAsciiIpv4 (Ptr stream, NodeContainer n); + void EnableAsciiIpv4 (Ptr stream, NodeContainer n); void EnableAsciiIpv4 (std::string prefix, uint32_t nodeid, uint32_t deviceid); - void EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface); void EnableAsciiIpv4All (std::string prefix); - void EnableAsciiIpv4All (Ptr stream); + void EnableAsciiIpv4All (Ptr stream); @end verbatim You are encouraged to peruse the Doxygen for class @code{PcapAndAsciiHelperForIpv4} @@ -1028,7 +1028,7 @@ refer to a single file. We have already something similar to this in the Ptr protocol1 = node1->GetObject (); Ptr protocol2 = node2->GetObject (); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAsciiIpv4 (stream, protocol1, 1); helper.EnableAsciiIpv4 (stream, protocol2, 1); @@ -1063,7 +1063,7 @@ stream object, you can use that form as well: Names::Add ("node1Ipv4" ...); Names::Add ("node2Ipv4" ...); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAsciiIpv4 (stream, "node1Ipv4", 1); helper.EnableAsciiIpv4 (stream, "node2Ipv4", 1); @@ -1106,7 +1106,7 @@ traces into a single file is accomplished similarly to the examples above: ipv4.SetBase ("10.1.1.0", "255.255.255.0"); Ipv4InterfaceContainer interfaces = ipv4.Assign (devices); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAsciiIpv4 (stream, interfaces); @end verbatim diff --git a/doc/tutorial/tracing.texi b/doc/tutorial/tracing.texi index 37c9f100e..436612f93 100644 --- a/doc/tutorial/tracing.texi +++ b/doc/tutorial/tracing.texi @@ -1937,7 +1937,7 @@ representing a file. @verbatim static void - CwndChange (Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) + CwndChange (Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) { NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << "\t" << newCwnd); *stream->GetStream () << Simulator::Now ().GetSeconds () << "\t" << oldCwnd << "\t" << newCwnd << std::endl; @@ -1973,7 +1973,7 @@ with @code{std::cout}, as in: std::cout << Simulator::Now ().GetSeconds () << "\t" << oldCwnd << "\t" << newCwnd << std::endl; @end verbatim -This illustrates that the @code{Ptr} is really just +This illustrates that the @code{Ptr} is really just carrying around a @code{std::ofstream} for you, and you can use it here like any other output stream. @@ -1992,7 +1992,7 @@ look in the @code{main} function, you will find new code to do just that: @verbatim AsciiTraceHelper asciiTraceHelper; - Ptr stream = asciiTraceHelper.CreateFileStream ("sixth.cwnd"); + Ptr stream = asciiTraceHelper.CreateFileStream ("sixth.cwnd"); ns3TcpSocket->TraceConnectWithoutContext ("CongestionWindow", MakeBoundCallback (&CwndChange, stream)); ... @@ -2023,7 +2023,7 @@ Essentially, @code{MakeBoundCallback(&CwndChange, stream)} causes the trace source to add the additional ``stream'' parameter to the front of the formal parameter list before invoking the callback. This changes the required signature of the @code{CwndChange} sink to match the one shown above, which -includes the ``extra'' parameter @code{Ptr stream}. +includes the ``extra'' parameter @code{Ptr stream}. In the second section of code in the snippet above, we instantiate a @code{PcapHelper} to do the same thing for our pcap trace file that we did @@ -2054,13 +2054,13 @@ objects are declared in very similar ways, @verbatim Ptr file ... - Ptr stream ... + Ptr stream ... @end verbatim The underlying objects are entirely different. For example, the Ptr is a smart pointer to an @command{ns-3} Object that is a fairly heaviweight thing that supports @code{Attributes} and is integrated into -the config system. The Ptr, on the other hand, is a smart +the config system. The Ptr, on the other hand, is a smart pointer to a reference counted object that is a very lightweight thing. Remember to always look at the object you are referencing before making any assumptions about the ``powers'' that object may have. @@ -2073,11 +2073,11 @@ distribution and notice, @end verbatim that class @code{PcapFileWrapper} is an @command{ns-3} Object by virtue of -its inheritance. Then look at @code{src/common/output-stream-keeper.h} and +its inheritance. Then look at @code{src/common/output-stream-wrapper.h} and notice, @verbatim - class OutputStreamKeeper : public SimpleRefCount + class OutputStreamWrapper : public SimpleRefCount @end verbatim that this object is not an @command{ns-3} Object at all, it is ``merely'' a @@ -2138,7 +2138,7 @@ core code involved, and we did this in only 18 lines of code: @verbatim static void - CwndChange (Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) + CwndChange (Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) { NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << "\t" << newCwnd); *stream->GetStream () << Simulator::Now ().GetSeconds () << "\t" << oldCwnd << "\t" << newCwnd << std::endl; @@ -2147,7 +2147,7 @@ core code involved, and we did this in only 18 lines of code: ... AsciiTraceHelper asciiTraceHelper; - Ptr stream = asciiTraceHelper.CreateFileStream ("sixth.cwnd"); + Ptr stream = asciiTraceHelper.CreateFileStream ("sixth.cwnd"); ns3TcpSocket->TraceConnectWithoutContext ("CongestionWindow", MakeBoundCallback (&CwndChange, stream)); ... @@ -2390,7 +2390,7 @@ also implement a single virtual method inherited from the ascii trace additions to this class. @verbatim - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) = 0; + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) = 0; @end verbatim The signature of this method reflects the device-centric view of the situation @@ -2402,7 +2402,7 @@ methods, @verbatim void EnableAscii (std::string prefix, Ptr nd); - void EnableAscii (Ptr stream, Ptr nd); + void EnableAscii (Ptr stream, Ptr nd); @verbatim will call the device implementation of @code{EnableAsciiInternal} directly, @@ -2417,22 +2417,22 @@ will all work in the same way across devices if the devices implement @verbatim void EnableAscii (std::string prefix, Ptr nd); - void EnableAscii (Ptr stream, Ptr nd); + void EnableAscii (Ptr stream, Ptr nd); void EnableAscii (std::string prefix, std::string ndName); - void EnableAscii (Ptr stream, std::string ndName); + void EnableAscii (Ptr stream, std::string ndName); void EnableAscii (std::string prefix, NetDeviceContainer d); - void EnableAscii (Ptr stream, NetDeviceContainer d); + void EnableAscii (Ptr stream, NetDeviceContainer d); void EnableAscii (std::string prefix, NodeContainer n); - void EnableAscii (Ptr stream, NodeContainer n); + void EnableAscii (Ptr stream, NodeContainer n); void EnableAscii (std::string prefix, uint32_t nodeid, uint32_t deviceid); - void EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid); + void EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid); void EnableAsciiAll (std::string prefix); - void EnableAsciiAll (Ptr stream); + void EnableAsciiAll (Ptr stream); @end verbatim You are encouraged to peruse the Doxygen for class @code{TraceHelperForDevice} @@ -2471,7 +2471,7 @@ above: Ptr nd1; Ptr nd2; ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAscii (stream, nd1); helper.EnableAscii (stream, nd2); @@ -2500,7 +2500,7 @@ belong to exactly one @code{Node}. For example, This would result in two files named ``prefix-client-eth0.tr'' and ``prefix-server-eth0.tr'' with traces for each device in the respective trace -file. Since all of the EnableAscii functions are overloaded to take a stream keeper, +file. Since all of the EnableAscii functions are overloaded to take a stream wrapper, you can use that form as well: @verbatim @@ -2509,7 +2509,7 @@ you can use that form as well: Names::Add ("server" ...); Names::Add ("server/eth0" ...); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAscii (stream, "client/eth0"); helper.EnableAscii (stream, "server/eth0"); @@ -2539,7 +2539,7 @@ traces into a single file is accomplished similarly to the examples above: @verbatim NetDeviceContainer d = ...; ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAscii (stream, d); @end verbatim @@ -2775,7 +2775,7 @@ for using ascii tracing to the PcapHelperForIpv4. Every protocol must additionally implement a single virtual method inherited from this class. @verbatim - virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, + virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface) = 0; @end verbatim @@ -2788,7 +2788,7 @@ methods, @verbatim void EnableAsciiIpv4 (std::string prefix, Ptr ipv4, uint32_t interface); - void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); @verbatim will call the device implementation of @code{EnableAsciiIpv4Internal} directly, @@ -2803,22 +2803,22 @@ will all work in the same way across protocols if the protocols implement @verbatim void EnableAsciiIpv4 (std::string prefix, Ptr ipv4, uint32_t interface); - void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); void EnableAsciiIpv4 (std::string prefix, std::string ipv4Name, uint32_t interface); - void EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface); void EnableAsciiIpv4 (std::string prefix, Ipv4InterfaceContainer c); - void EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c); + void EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c); void EnableAsciiIpv4 (std::string prefix, NodeContainer n); - void EnableAsciiIpv4 (Ptr stream, NodeContainer n); + void EnableAsciiIpv4 (Ptr stream, NodeContainer n); void EnableAsciiIpv4 (std::string prefix, uint32_t nodeid, uint32_t deviceid); - void EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface); void EnableAsciiIpv4All (std::string prefix); - void EnableAsciiIpv4All (Ptr stream); + void EnableAsciiIpv4All (Ptr stream); @end verbatim You are encouraged to peruse the Doxygen for class @code{PcapAndAsciiHelperForIpv4} @@ -2857,7 +2857,7 @@ refer to a single file. We have already something similar to this in the Ptr protocol1 = node1->GetObject (); Ptr protocol2 = node2->GetObject (); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAsciiIpv4 (stream, protocol1, 1); helper.EnableAsciiIpv4 (stream, protocol2, 1); @@ -2886,13 +2886,13 @@ For example, This would result in two files named ``prefix-nnode1Ipv4-i1.tr'' and ``prefix-nnode2Ipv4-i1.tr'' with traces for each interface in the respective trace file. Since all of the EnableAscii functions are overloaded to take a -stream keeper, you can use that form as well: +stream wrapper, you can use that form as well: @verbatim Names::Add ("node1Ipv4" ...); Names::Add ("node2Ipv4" ...); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAsciiIpv4 (stream, "node1Ipv4", 1); helper.EnableAsciiIpv4 (stream, "node2Ipv4", 1); @@ -2935,7 +2935,7 @@ traces into a single file is accomplished similarly to the examples above: ipv4.SetBase ("10.1.1.0", "255.255.255.0"); Ipv4InterfaceContainer interfaces = ipv4.Assign (devices); ... - Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); + Ptr stream = asciiTraceHelper.CreateFileStream ("trace-file-name.tr"); ... helper.EnableAsciiIpv4 (stream, interfaces); @end verbatim diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc index 2bd204374..2c1648fc7 100644 --- a/examples/routing/dynamic-global-routing.cc +++ b/examples/routing/dynamic-global-routing.cc @@ -191,7 +191,7 @@ main (int argc, char *argv[]) AsciiTraceHelper ascii; - Ptr stream = ascii.CreateFileStream ("dynamic-global-routing.tr"); + Ptr stream = ascii.CreateFileStream ("dynamic-global-routing.tr"); p2p.EnableAsciiAll (stream); csma.EnableAsciiAll (stream); internet.EnableAsciiIpv4All (stream); diff --git a/examples/routing/mixed-global-routing.cc b/examples/routing/mixed-global-routing.cc index 16d011140..7fa348fec 100644 --- a/examples/routing/mixed-global-routing.cc +++ b/examples/routing/mixed-global-routing.cc @@ -121,7 +121,7 @@ main (int argc, char *argv[]) apps.Stop (Seconds (10.0)); AsciiTraceHelper ascii; - Ptr stream = ascii.CreateFileStream ("mixed-global-routing.tr"); + Ptr stream = ascii.CreateFileStream ("mixed-global-routing.tr"); p2p.EnableAsciiAll (stream); csma.EnableAsciiAll (stream); diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index 4f975d7bc..6687454c2 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -161,7 +161,7 @@ MyApp::ScheduleTx (void) } static void -CwndChange (Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) +CwndChange (Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) { NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << "\t" << newCwnd); *stream->GetStream () << Simulator::Now ().GetSeconds () << "\t" << oldCwnd << "\t" << newCwnd << std::endl; @@ -215,7 +215,7 @@ main (int argc, char *argv[]) app->SetStopTime (Seconds (20.)); AsciiTraceHelper asciiTraceHelper; - Ptr stream = asciiTraceHelper.CreateFileStream ("sixth.cwnd"); + Ptr stream = asciiTraceHelper.CreateFileStream ("sixth.cwnd"); ns3TcpSocket->TraceConnectWithoutContext ("CongestionWindow", MakeBoundCallback (&CwndChange, stream)); PcapHelper pcapHelper; diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index c4f259228..e348f1883 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -389,7 +389,7 @@ main (int argc, char *argv[]) // Let's set up some ns-2-like ascii traces, using another helper class // AsciiTraceHelper ascii; - Ptr stream = ascii.CreateFileStream ("mixed-wireless.tr"); + Ptr stream = ascii.CreateFileStream ("mixed-wireless.tr"); wifiPhy.EnableAsciiAll (stream); csma.EnableAsciiAll (stream); internet.EnableAsciiIpv4All (stream); diff --git a/src/common/output-stream-keeper.cc b/src/common/output-stream-wrapper.cc similarity index 78% rename from src/common/output-stream-keeper.cc rename to src/common/output-stream-wrapper.cc index 627c673ff..93bcc7381 100644 --- a/src/common/output-stream-keeper.cc +++ b/src/common/output-stream-wrapper.cc @@ -17,31 +17,31 @@ */ #include "ns3/log.h" -#include "output-stream-keeper.h" +#include "output-stream-wrapper.h" -NS_LOG_COMPONENT_DEFINE ("OutputStreamKeeper"); +NS_LOG_COMPONENT_DEFINE ("OutputStreamWrapper"); namespace ns3 { -OutputStreamKeeper::OutputStreamKeeper () +OutputStreamWrapper::OutputStreamWrapper () : m_ostream (0) { } -OutputStreamKeeper::~OutputStreamKeeper () +OutputStreamWrapper::~OutputStreamWrapper () { delete m_ostream; m_ostream = 0; } void -OutputStreamKeeper::SetStream (std::ostream *ostream) +OutputStreamWrapper::SetStream (std::ostream *ostream) { m_ostream = ostream; } std::ostream * -OutputStreamKeeper::GetStream (void) +OutputStreamWrapper::GetStream (void) { return m_ostream; } diff --git a/src/common/output-stream-keeper.h b/src/common/output-stream-wrapper.h similarity index 87% rename from src/common/output-stream-keeper.h rename to src/common/output-stream-wrapper.h index 63ffa335c..02293fe1c 100644 --- a/src/common/output-stream-keeper.h +++ b/src/common/output-stream-wrapper.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef OUTPUT_STREAM_KEEPER_H -#define OUTPUT_STREAM_KEEPER_H +#ifndef OUTPUT_STREAM_WRAPPER_H +#define OUTPUT_STREAM_WRAPPER_H #include #include "ns3/object.h" @@ -55,7 +55,7 @@ namespace ns3 { * * One could imagine having this object inherit from stream to get the various * overloaded operator<< defined, but we're going to be using a - * Ptr when passing this object around. In this case, the + * Ptr when passing this object around. In this case, the * Ptr<> wouldn't understand the operators and we would have to dereference it * to access the underlying object methods. Since we would have to dereference * the Ptr<>, we don't bother and just expect the user to Get a saved pointer @@ -63,20 +63,20 @@ namespace ns3 { * * \verbatim * void - * TraceSink (Ptr streamKeeper, Ptr packet) + * TraceSink (Ptr streamWrapper, Ptr packet) * { - * std::ostream *stream = streamKeeper->GetStream (); + * std::ostream *stream = streamWrapper->GetStream (); * *stream << "got packet" << std::endl; * } * \endverbatim */ -class OutputStreamKeeper : public SimpleRefCount +class OutputStreamWrapper : public SimpleRefCount { public: static TypeId GetTypeId (void); - OutputStreamKeeper (); - ~OutputStreamKeeper (); + OutputStreamWrapper (); + ~OutputStreamWrapper (); void SetStream (std::ostream *ostream); std::ostream *GetStream (void); @@ -87,4 +87,4 @@ private: } //namespace ns3 -#endif // OUTPUT_STREAM_KEEPER_H +#endif // OUTPUT_STREAM_WRAPPER_H diff --git a/src/common/wscript b/src/common/wscript index 25ea3b714..3d4c37b44 100644 --- a/src/common/wscript +++ b/src/common/wscript @@ -20,7 +20,7 @@ def build(bld): 'pcap-file.cc', 'pcap-file-test-suite.cc', 'pcap-file-wrapper.cc', - 'output-stream-keeper.cc', + 'output-stream-wrapper.cc', 'propagation-delay-model.cc', 'propagation-loss-model.cc', 'propagation-loss-model-test-suite.cc', @@ -46,7 +46,7 @@ def build(bld): 'sgi-hashmap.h', 'pcap-file.h', 'pcap-file-wrapper.h', - 'output-stream-keeper.h', + 'output-stream-wrapper.h', 'propagation-delay-model.h', 'propagation-loss-model.h', 'jakes-propagation-loss-model.h', diff --git a/src/helper/csma-helper.cc b/src/helper/csma-helper.cc index 7a496d947..85149ad1a 100644 --- a/src/helper/csma-helper.cc +++ b/src/helper/csma-helper.cc @@ -100,7 +100,7 @@ CsmaHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool prom } void -CsmaHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) +CsmaHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) { // // All of the ascii enable functions vector through here including the ones @@ -121,7 +121,7 @@ CsmaHelper::EnableAsciiInternal (Ptr stream, std::string pre Packet::EnablePrinting (); // - // If we are not provided an OutputStreamKeeper, we are expected to create + // If we are not provided an OutputStreamWrapper, we are expected to create // one using the usual trace filename conventions and do a Hook*WithoutContext // since there will be one file per context and therefore the context would // be redundant. @@ -135,7 +135,7 @@ CsmaHelper::EnableAsciiInternal (Ptr stream, std::string pre // AsciiTraceHelper asciiTraceHelper; std::string filename = asciiTraceHelper.GetFilenameFromDevice (prefix, device); - Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); + Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); // // The MacRx trace source provides our "r" event. @@ -155,7 +155,7 @@ CsmaHelper::EnableAsciiInternal (Ptr stream, std::string pre } // - // If we are provided an OutputStreamKeeper, we are expected to use it, and + // If we are provided an OutputStreamWrapper, we are expected to use it, and // to providd a context. We are free to come up with our own context if we // want, and use the AsciiTraceHelper Hook*WithContext functions, but for // compatibility and simplicity, we just use Config::Connect and let it deal diff --git a/src/helper/csma-helper.h b/src/helper/csma-helper.h index b53aa3d63..7305a6f79 100644 --- a/src/helper/csma-helper.h +++ b/src/helper/csma-helper.h @@ -221,7 +221,7 @@ private: * \param prefix Filename prefix to use for ascii trace files. * \param nd Net device for which you want to enable tracing. */ - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); ObjectFactory m_queueFactory; ObjectFactory m_deviceFactory; diff --git a/src/helper/emu-helper.cc b/src/helper/emu-helper.cc index 530540b8c..e2d288f5c 100644 --- a/src/helper/emu-helper.cc +++ b/src/helper/emu-helper.cc @@ -93,7 +93,7 @@ EmuHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool promi } void -EmuHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) +EmuHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) { // // All of the ascii enable functions vector through here including the ones @@ -114,7 +114,7 @@ EmuHelper::EnableAsciiInternal (Ptr stream, std::string pref Packet::EnablePrinting (); // - // If we are not provided an OutputStreamKeeper, we are expected to create + // If we are not provided an OutputStreamWrapper, we are expected to create // one using the usual trace filename conventions and do a Hook*WithoutContext // since there will be one file per context and therefore the context would // be redundant. @@ -128,7 +128,7 @@ EmuHelper::EnableAsciiInternal (Ptr stream, std::string pref // AsciiTraceHelper asciiTraceHelper; std::string filename = asciiTraceHelper.GetFilenameFromDevice (prefix, device); - Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); + Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); // // The MacRx trace source provides our "r" event. @@ -148,7 +148,7 @@ EmuHelper::EnableAsciiInternal (Ptr stream, std::string pref } // - // If we are provided an OutputStreamKeeper, we are expected to use it, and + // If we are provided an OutputStreamWrapper, we are expected to use it, and // to providd a context. We are free to come up with our own context if we // want, and use the AsciiTraceHelper Hook*WithContext functions, but for // compatibility and simplicity, we just use Config::Connect and let it deal diff --git a/src/helper/emu-helper.h b/src/helper/emu-helper.h index 0c99638ad..282acba87 100644 --- a/src/helper/emu-helper.h +++ b/src/helper/emu-helper.h @@ -138,7 +138,7 @@ private: * \param prefix Filename prefix to use for ascii trace files. * \param nd Net device for which you want to enable tracing. */ - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); ObjectFactory m_queueFactory; ObjectFactory m_deviceFactory; diff --git a/src/helper/internet-stack-helper.cc b/src/helper/internet-stack-helper.cc index 8cb2d72f4..bec69df05 100644 --- a/src/helper/internet-stack-helper.cc +++ b/src/helper/internet-stack-helper.cc @@ -212,14 +212,14 @@ namespace ns3 { // typedef std::pair, uint32_t> InterfacePairIpv4; typedef std::map > InterfaceFileMapIpv4; -typedef std::map > InterfaceStreamMapIpv4; +typedef std::map > InterfaceStreamMapIpv4; static InterfaceFileMapIpv4 g_interfaceFileMapIpv4; /**< A mapping of Ipv4/interface pairs to pcap files */ static InterfaceStreamMapIpv4 g_interfaceStreamMapIpv4; /**< A mapping of Ipv4/interface pairs to ascii streams */ typedef std::pair, uint32_t> InterfacePairIpv6; typedef std::map > InterfaceFileMapIpv6; -typedef std::map > InterfaceStreamMapIpv6; +typedef std::map > InterfaceStreamMapIpv6; static InterfaceFileMapIpv6 g_interfaceFileMapIpv6; /**< A mapping of Ipv6/interface pairs to pcap files */ static InterfaceStreamMapIpv6 g_interfaceStreamMapIpv6; /**< A mapping of Ipv6/interface pairs to pcap files */ @@ -572,7 +572,7 @@ InternetStackHelper::EnablePcapIpv6Internal (std::string prefix, Ptr ipv6, static void Ipv4L3ProtocolDropSinkWithoutContext ( - Ptr stream, + Ptr stream, Ipv4Header const &header, Ptr packet, Ipv4L3Protocol::DropReason reason, @@ -599,7 +599,7 @@ Ipv4L3ProtocolDropSinkWithoutContext ( static void Ipv4L3ProtocolDropSinkWithContext ( - Ptr stream, + Ptr stream, std::string context, Ipv4Header const &header, Ptr packet, @@ -647,7 +647,7 @@ InternetStackHelper::AsciiHooked (Ptr ipv4) void InternetStackHelper::EnableAsciiIpv4Internal ( - Ptr stream, + Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface) @@ -665,7 +665,7 @@ InternetStackHelper::EnableAsciiIpv4Internal ( Packet::EnablePrinting (); // - // If we are not provided an OutputStreamKeeper, we are expected to create + // If we are not provided an OutputStreamWrapper, we are expected to create // one using the usual trace filename conventions and hook WithoutContext // since there will be one file per context and therefore the context would // be redundant. @@ -683,7 +683,7 @@ InternetStackHelper::EnableAsciiIpv4Internal ( // AsciiTraceHelper asciiTraceHelper; std::string filename = asciiTraceHelper.GetFilenameFromInterfacePair (prefix, ipv4, interface); - Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); + Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); // // However, we only hook the trace sources once to avoid multiple trace sink @@ -717,7 +717,7 @@ InternetStackHelper::EnableAsciiIpv4Internal ( } // - // If we are provided an OutputStreamKeeper, we are expected to use it, and + // If we are provided an OutputStreamWrapper, we are expected to use it, and // to provide a context. We are free to come up with our own context if we // want, and use the AsciiTraceHelper Hook*WithContext functions, but for // compatibility and simplicity, we just use Config::Connect and let it deal @@ -756,7 +756,7 @@ InternetStackHelper::EnableAsciiIpv4Internal ( static void Ipv6L3ProtocolDropSinkWithoutContext ( - Ptr stream, + Ptr stream, Ipv6Header const &header, Ptr packet, Ipv6L3Protocol::DropReason reason, @@ -783,7 +783,7 @@ Ipv6L3ProtocolDropSinkWithoutContext ( static void Ipv6L3ProtocolDropSinkWithContext ( - Ptr stream, + Ptr stream, std::string context, Ipv6Header const &header, Ptr packet, @@ -831,7 +831,7 @@ InternetStackHelper::AsciiHooked (Ptr ipv6) void InternetStackHelper::EnableAsciiIpv6Internal ( - Ptr stream, + Ptr stream, std::string prefix, Ptr ipv6, uint32_t interface) @@ -849,7 +849,7 @@ InternetStackHelper::EnableAsciiIpv6Internal ( Packet::EnablePrinting (); // - // If we are not provided an OutputStreamKeeper, we are expected to create + // If we are not provided an OutputStreamWrapper, we are expected to create // one using the usual trace filename conventions and do a hook WithoutContext // since there will be one file per context and therefore the context would // be redundant. @@ -867,7 +867,7 @@ InternetStackHelper::EnableAsciiIpv6Internal ( // AsciiTraceHelper asciiTraceHelper; std::string filename = asciiTraceHelper.GetFilenameFromInterfacePair (prefix, ipv6, interface); - Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); + Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); // // However, we only hook the trace sources once to avoid multiple trace sink @@ -893,7 +893,7 @@ InternetStackHelper::EnableAsciiIpv6Internal ( } // - // If we are provided an OutputStreamKeeper, we are expected to use it, and + // If we are provided an OutputStreamWrapper, we are expected to use it, and // to provide a context. We are free to come up with our own context if we // want, and use the AsciiTraceHelper Hook*WithContext functions, but for // compatibility and simplicity, we just use Config::Connect and let it deal diff --git a/src/helper/internet-stack-helper.h b/src/helper/internet-stack-helper.h index 5875e4350..59c67b7c2 100644 --- a/src/helper/internet-stack-helper.h +++ b/src/helper/internet-stack-helper.h @@ -185,13 +185,13 @@ private: * @brief Enable ascii trace output on the indicated Ipv4 and interface pair. * @internal * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param prefix Filename prefix to use for ascii trace files. * @param ipv4 Ptr to the Ipv4 interface on which you want to enable tracing. * @param interface Interface ID on the Ipv4 on which you want to enable tracing. */ - virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, + virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface); /** @@ -209,13 +209,13 @@ private: * @brief Enable ascii trace output on the indicated Ipv4 and interface pair. * @internal * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param prefix Filename prefix to use for ascii trace files. * @param ipv4 Ptr to the Ipv4 interface on which you want to enable tracing. * @param interface Interface ID on the Ipv4 on which you want to enable tracing. */ - virtual void EnableAsciiIpv6Internal (Ptr stream, std::string prefix, + virtual void EnableAsciiIpv6Internal (Ptr stream, std::string prefix, Ptr ipv6, uint32_t interface); void Initialize (void); diff --git a/src/helper/point-to-point-helper.cc b/src/helper/point-to-point-helper.cc index d01bb7915..5e3304329 100644 --- a/src/helper/point-to-point-helper.cc +++ b/src/helper/point-to-point-helper.cc @@ -90,7 +90,7 @@ PointToPointHelper::EnablePcapInternal (std::string prefix, Ptr nd, b } void -PointToPointHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) +PointToPointHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) { // // All of the ascii enable functions vector through here including the ones @@ -112,7 +112,7 @@ PointToPointHelper::EnableAsciiInternal (Ptr stream, std::st Packet::EnablePrinting (); // - // If we are not provided an OutputStreamKeeper, we are expected to create + // If we are not provided an OutputStreamWrapper, we are expected to create // one using the usual trace filename conventions and do a Hook*WithoutContext // since there will be one file per context and therefore the context would // be redundant. @@ -126,7 +126,7 @@ PointToPointHelper::EnableAsciiInternal (Ptr stream, std::st // AsciiTraceHelper asciiTraceHelper; std::string filename = asciiTraceHelper.GetFilenameFromDevice (prefix, device); - Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); + Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); // // The MacRx trace source provides our "r" event. @@ -146,7 +146,7 @@ PointToPointHelper::EnableAsciiInternal (Ptr stream, std::st } // - // If we are provided an OutputStreamKeeper, we are expected to use it, and + // If we are provided an OutputStreamWrapper, we are expected to use it, and // to providd a context. We are free to come up with our own context if we // want, and use the AsciiTraceHelper Hook*WithContext functions, but for // compatibility and simplicity, we just use Config::Connect and let it deal diff --git a/src/helper/point-to-point-helper.h b/src/helper/point-to-point-helper.h index e4e1817e8..afeb4c292 100644 --- a/src/helper/point-to-point-helper.h +++ b/src/helper/point-to-point-helper.h @@ -167,7 +167,7 @@ private: * \param prefix Filename prefix to use for ascii trace files. * \param nd Net device for which you want to enable tracing. */ - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); ObjectFactory m_queueFactory; ObjectFactory m_channelFactory; diff --git a/src/helper/trace-helper.cc b/src/helper/trace-helper.cc index 68ff0b3ef..bdb294a0f 100644 --- a/src/helper/trace-helper.cc +++ b/src/helper/trace-helper.cc @@ -180,7 +180,7 @@ AsciiTraceHelper::~AsciiTraceHelper () NS_LOG_FUNCTION_NOARGS (); } -Ptr +Ptr AsciiTraceHelper::CreateFileStream (std::string filename, std::string filemode) { NS_LOG_FUNCTION (filename << filemode); @@ -205,8 +205,8 @@ AsciiTraceHelper::CreateFileStream (std::string filename, std::string filemode) NS_ABORT_MSG_UNLESS (ofstream->is_open (), "AsciiTraceHelper::CreateFileStream(): Unable to Open " << filename << " for mode " << filemode); - Ptr StreamKeeper = Create (); - StreamKeeper->SetStream (ofstream); + Ptr StreamWrapper = Create (); + StreamWrapper->SetStream (ofstream); // // Note that the ascii trace helper promptly forgets all about the trace file. @@ -219,7 +219,7 @@ AsciiTraceHelper::CreateFileStream (std::string filename, std::string filemode) // and the stream object will be destroyed, releasing the pointer and closing // the underlying file. // - return StreamKeeper; + return StreamWrapper; } std::string @@ -321,14 +321,14 @@ AsciiTraceHelper::GetFilenameFromInterfacePair ( // in the device (actually the Queue in the device). // void -AsciiTraceHelper::DefaultEnqueueSinkWithoutContext (Ptr stream, Ptr p) +AsciiTraceHelper::DefaultEnqueueSinkWithoutContext (Ptr stream, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "+ " << Simulator::Now ().GetSeconds () << " " << *p << std::endl; } void -AsciiTraceHelper::DefaultEnqueueSinkWithContext (Ptr stream, std::string context, Ptr p) +AsciiTraceHelper::DefaultEnqueueSinkWithContext (Ptr stream, std::string context, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "+ " << Simulator::Now ().GetSeconds () << " " << context << " " << *p << std::endl; @@ -347,14 +347,14 @@ AsciiTraceHelper::DefaultEnqueueSinkWithContext (Ptr stream, // in the device (actually the Queue in the device). // void -AsciiTraceHelper::DefaultDropSinkWithoutContext (Ptr stream, Ptr p) +AsciiTraceHelper::DefaultDropSinkWithoutContext (Ptr stream, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "d " << Simulator::Now ().GetSeconds () << " " << *p << std::endl; } void -AsciiTraceHelper::DefaultDropSinkWithContext (Ptr stream, std::string context, Ptr p) +AsciiTraceHelper::DefaultDropSinkWithContext (Ptr stream, std::string context, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "d " << Simulator::Now ().GetSeconds () << " " << context << " " << *p << std::endl; @@ -374,14 +374,14 @@ AsciiTraceHelper::DefaultDropSinkWithContext (Ptr stream, st // in the device (actually the Queue in the device). // void -AsciiTraceHelper::DefaultDequeueSinkWithoutContext (Ptr stream, Ptr p) +AsciiTraceHelper::DefaultDequeueSinkWithoutContext (Ptr stream, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "- " << Simulator::Now ().GetSeconds () << " " << *p << std::endl; } void -AsciiTraceHelper::DefaultDequeueSinkWithContext (Ptr stream, std::string context, Ptr p) +AsciiTraceHelper::DefaultDequeueSinkWithContext (Ptr stream, std::string context, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "- " << Simulator::Now ().GetSeconds () << " " << context << " " << *p << std::endl; @@ -398,14 +398,14 @@ AsciiTraceHelper::DefaultDequeueSinkWithContext (Ptr stream, // This is typically implemented by hooking the "MacRx" trace hook in the // device. void -AsciiTraceHelper::DefaultReceiveSinkWithoutContext (Ptr stream, Ptr p) +AsciiTraceHelper::DefaultReceiveSinkWithoutContext (Ptr stream, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "r " << Simulator::Now ().GetSeconds () << " " << *p << std::endl; } void -AsciiTraceHelper::DefaultReceiveSinkWithContext (Ptr stream, std::string context, Ptr p) +AsciiTraceHelper::DefaultReceiveSinkWithContext (Ptr stream, std::string context, Ptr p) { NS_LOG_FUNCTION (stream << p); *stream->GetStream () << "r " << Simulator::Now ().GetSeconds () << " " << context << " " << *p << std::endl; @@ -482,14 +482,14 @@ PcapHelperForDevice::EnablePcap (std::string prefix, uint32_t nodeid, uint32_t d void AsciiTraceHelperForDevice::EnableAscii (std::string prefix, Ptr nd) { - EnableAsciiInternal (Ptr (), prefix, nd); + EnableAsciiInternal (Ptr (), prefix, nd); } // // Public API // void -AsciiTraceHelperForDevice::EnableAscii (Ptr stream, Ptr nd) +AsciiTraceHelperForDevice::EnableAscii (Ptr stream, Ptr nd) { EnableAsciiInternal (stream, std::string (), nd); } @@ -500,14 +500,14 @@ AsciiTraceHelperForDevice::EnableAscii (Ptr stream, Ptr (), prefix, ndName); + EnableAsciiImpl (Ptr (), prefix, ndName); } // // Public API // void -AsciiTraceHelperForDevice::EnableAscii (Ptr stream, std::string ndName) +AsciiTraceHelperForDevice::EnableAscii (Ptr stream, std::string ndName) { EnableAsciiImpl (stream, std::string (), ndName); } @@ -516,7 +516,7 @@ AsciiTraceHelperForDevice::EnableAscii (Ptr stream, std::str // Private API // void -AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std::string prefix, std::string ndName) +AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std::string prefix, std::string ndName) { Ptr nd = Names::Find (ndName); EnableAsciiInternal (stream, prefix, nd); @@ -528,14 +528,14 @@ AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std: void AsciiTraceHelperForDevice::EnableAscii (std::string prefix, NetDeviceContainer d) { - EnableAsciiImpl (Ptr (), prefix, d); + EnableAsciiImpl (Ptr (), prefix, d); } // // Public API // void -AsciiTraceHelperForDevice::EnableAscii (Ptr stream, NetDeviceContainer d) +AsciiTraceHelperForDevice::EnableAscii (Ptr stream, NetDeviceContainer d) { EnableAsciiImpl (stream, std::string (), d); } @@ -544,7 +544,7 @@ AsciiTraceHelperForDevice::EnableAscii (Ptr stream, NetDevic // Private API // void -AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std::string prefix, NetDeviceContainer d) +AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std::string prefix, NetDeviceContainer d) { for (NetDeviceContainer::Iterator i = d.Begin (); i != d.End (); ++i) { @@ -559,14 +559,14 @@ AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std: void AsciiTraceHelperForDevice::EnableAscii (std::string prefix, NodeContainer n) { - EnableAsciiImpl (Ptr (), prefix, n); + EnableAsciiImpl (Ptr (), prefix, n); } // // Public API // void -AsciiTraceHelperForDevice::EnableAscii (Ptr stream, NodeContainer n) +AsciiTraceHelperForDevice::EnableAscii (Ptr stream, NodeContainer n) { EnableAsciiImpl (stream, std::string (), n); } @@ -575,7 +575,7 @@ AsciiTraceHelperForDevice::EnableAscii (Ptr stream, NodeCont // Private API // void -AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std::string prefix, NodeContainer n) +AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std::string prefix, NodeContainer n) { NetDeviceContainer devs; for (NodeContainer::Iterator i = n.Begin (); i != n.End (); ++i) @@ -595,14 +595,14 @@ AsciiTraceHelperForDevice::EnableAsciiImpl (Ptr stream, std: void AsciiTraceHelperForDevice::EnableAsciiAll (std::string prefix) { - EnableAsciiImpl (Ptr (), prefix, NodeContainer::GetGlobal ()); + EnableAsciiImpl (Ptr (), prefix, NodeContainer::GetGlobal ()); } // // Public API // void -AsciiTraceHelperForDevice::EnableAsciiAll (Ptr stream) +AsciiTraceHelperForDevice::EnableAsciiAll (Ptr stream) { EnableAsciiImpl (stream, std::string (), NodeContainer::GetGlobal ()); } @@ -611,7 +611,7 @@ AsciiTraceHelperForDevice::EnableAsciiAll (Ptr stream) // Public API // void -AsciiTraceHelperForDevice::EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid) +AsciiTraceHelperForDevice::EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid) { EnableAsciiImpl (stream, std::string (), nodeid, deviceid); } @@ -622,7 +622,7 @@ AsciiTraceHelperForDevice::EnableAscii (Ptr stream, uint32_t void AsciiTraceHelperForDevice::EnableAscii (std::string prefix, uint32_t nodeid, uint32_t deviceid) { - EnableAsciiImpl (Ptr (), prefix, nodeid, deviceid); + EnableAsciiImpl (Ptr (), prefix, nodeid, deviceid); } // @@ -630,7 +630,7 @@ AsciiTraceHelperForDevice::EnableAscii (std::string prefix, uint32_t nodeid, uin // void AsciiTraceHelperForDevice::EnableAsciiImpl ( - Ptr stream, + Ptr stream, std::string prefix, uint32_t nodeid, uint32_t deviceid) @@ -729,14 +729,14 @@ PcapHelperForIpv4::EnablePcapIpv4 (std::string prefix, uint32_t nodeid, uint32_t void AsciiTraceHelperForIpv4::EnableAsciiIpv4 (std::string prefix, Ptr ipv4, uint32_t interface) { - EnableAsciiIpv4Internal (Ptr (), prefix, ipv4, interface); + EnableAsciiIpv4Internal (Ptr (), prefix, ipv4, interface); } // // Public API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface) +AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface) { EnableAsciiIpv4Internal (stream, std::string (), ipv4, interface); } @@ -747,14 +747,14 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, Ptr (), prefix, ipv4Name, interface); + EnableAsciiIpv4Impl (Ptr (), prefix, ipv4Name, interface); } // // Public API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface) +AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface) { EnableAsciiIpv4Impl (stream, std::string (), ipv4Name, interface); } @@ -764,7 +764,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, std::s // void AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl ( - Ptr stream, + Ptr stream, std::string prefix, std::string ipv4Name, uint32_t interface) @@ -779,14 +779,14 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl ( void AsciiTraceHelperForIpv4::EnableAsciiIpv4 (std::string prefix, Ipv4InterfaceContainer c) { - EnableAsciiIpv4Impl (Ptr (), prefix, c); + EnableAsciiIpv4Impl (Ptr (), prefix, c); } // // Public API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c) +AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c) { EnableAsciiIpv4Impl (stream, std::string (), c); } @@ -795,7 +795,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, Ipv4In // Private API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl (Ptr stream, std::string prefix, Ipv4InterfaceContainer c) +AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl (Ptr stream, std::string prefix, Ipv4InterfaceContainer c) { for (Ipv4InterfaceContainer::Iterator i = c.Begin (); i != c.End (); ++i) { @@ -810,14 +810,14 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl (Ptr stream, st void AsciiTraceHelperForIpv4::EnableAsciiIpv4 (std::string prefix, NodeContainer n) { - EnableAsciiIpv4Impl (Ptr (), prefix, n); + EnableAsciiIpv4Impl (Ptr (), prefix, n); } // // Public API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, NodeContainer n) +AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, NodeContainer n) { EnableAsciiIpv4Impl (stream, std::string (), n); } @@ -826,7 +826,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, NodeCo // Private API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl (Ptr stream, std::string prefix, NodeContainer n) +AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl (Ptr stream, std::string prefix, NodeContainer n) { for (NodeContainer::Iterator i = n.Begin (); i != n.End (); ++i) { @@ -848,14 +848,14 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl (Ptr stream, st void AsciiTraceHelperForIpv4::EnableAsciiIpv4All (std::string prefix) { - EnableAsciiIpv4Impl (Ptr (), prefix, NodeContainer::GetGlobal ()); + EnableAsciiIpv4Impl (Ptr (), prefix, NodeContainer::GetGlobal ()); } // // Public API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4All (Ptr stream) +AsciiTraceHelperForIpv4::EnableAsciiIpv4All (Ptr stream) { EnableAsciiIpv4Impl (stream, std::string (), NodeContainer::GetGlobal ()); } @@ -864,7 +864,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4All (Ptr stream) // Public API // void -AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface) +AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface) { EnableAsciiIpv4Impl (stream, std::string (), nodeid, interface); } @@ -875,7 +875,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4 (Ptr stream, uint32 void AsciiTraceHelperForIpv4::EnableAsciiIpv4 (std::string prefix, uint32_t nodeid, uint32_t interface) { - EnableAsciiIpv4Impl (Ptr (), prefix, nodeid, interface); + EnableAsciiIpv4Impl (Ptr (), prefix, nodeid, interface); } // @@ -883,7 +883,7 @@ AsciiTraceHelperForIpv4::EnableAsciiIpv4 (std::string prefix, uint32_t nodeid, u // void AsciiTraceHelperForIpv4::EnableAsciiIpv4Impl ( - Ptr stream, + Ptr stream, std::string prefix, uint32_t nodeid, uint32_t interface) @@ -982,14 +982,14 @@ PcapHelperForIpv6::EnablePcapIpv6 (std::string prefix, uint32_t nodeid, uint32_t void AsciiTraceHelperForIpv6::EnableAsciiIpv6 (std::string prefix, Ptr ipv6, uint32_t interface) { - EnableAsciiIpv6Internal (Ptr (), prefix, ipv6, interface); + EnableAsciiIpv6Internal (Ptr (), prefix, ipv6, interface); } // // Public API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, Ptr ipv6, uint32_t interface) +AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, Ptr ipv6, uint32_t interface) { EnableAsciiIpv6Internal (stream, std::string (), ipv6, interface); } @@ -1000,14 +1000,14 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, Ptr (), prefix, ipv6Name, interface); + EnableAsciiIpv6Impl (Ptr (), prefix, ipv6Name, interface); } // // Public API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, std::string ipv6Name, uint32_t interface) +AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, std::string ipv6Name, uint32_t interface) { EnableAsciiIpv6Impl (stream, std::string (), ipv6Name, interface); } @@ -1017,7 +1017,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, std::s // void AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl ( - Ptr stream, + Ptr stream, std::string prefix, std::string ipv6Name, uint32_t interface) @@ -1032,14 +1032,14 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl ( void AsciiTraceHelperForIpv6::EnableAsciiIpv6 (std::string prefix, Ipv6InterfaceContainer c) { - EnableAsciiIpv6Impl (Ptr (), prefix, c); + EnableAsciiIpv6Impl (Ptr (), prefix, c); } // // Public API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, Ipv6InterfaceContainer c) +AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, Ipv6InterfaceContainer c) { EnableAsciiIpv6Impl (stream, std::string (), c); } @@ -1048,7 +1048,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, Ipv6In // Private API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl (Ptr stream, std::string prefix, Ipv6InterfaceContainer c) +AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl (Ptr stream, std::string prefix, Ipv6InterfaceContainer c) { for (Ipv6InterfaceContainer::Iterator i = c.Begin (); i != c.End (); ++i) { @@ -1063,14 +1063,14 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl (Ptr stream, st void AsciiTraceHelperForIpv6::EnableAsciiIpv6 (std::string prefix, NodeContainer n) { - EnableAsciiIpv6Impl (Ptr (), prefix, n); + EnableAsciiIpv6Impl (Ptr (), prefix, n); } // // Public API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, NodeContainer n) +AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, NodeContainer n) { EnableAsciiIpv6Impl (stream, std::string (), n); } @@ -1079,7 +1079,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, NodeCo // Private API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl (Ptr stream, std::string prefix, NodeContainer n) +AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl (Ptr stream, std::string prefix, NodeContainer n) { for (NodeContainer::Iterator i = n.Begin (); i != n.End (); ++i) { @@ -1101,14 +1101,14 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl (Ptr stream, st void AsciiTraceHelperForIpv6::EnableAsciiIpv6All (std::string prefix) { - EnableAsciiIpv6Impl (Ptr (), prefix, NodeContainer::GetGlobal ()); + EnableAsciiIpv6Impl (Ptr (), prefix, NodeContainer::GetGlobal ()); } // // Public API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6All (Ptr stream) +AsciiTraceHelperForIpv6::EnableAsciiIpv6All (Ptr stream) { EnableAsciiIpv6Impl (stream, std::string (), NodeContainer::GetGlobal ()); } @@ -1117,7 +1117,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6All (Ptr stream) // Public API // void -AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, uint32_t nodeid, uint32_t interface) +AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, uint32_t nodeid, uint32_t interface) { EnableAsciiIpv6Impl (stream, std::string (), nodeid, interface); } @@ -1128,7 +1128,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6 (Ptr stream, uint32 void AsciiTraceHelperForIpv6::EnableAsciiIpv6 (std::string prefix, uint32_t nodeid, uint32_t interface) { - EnableAsciiIpv6Impl (Ptr (), prefix, nodeid, interface); + EnableAsciiIpv6Impl (Ptr (), prefix, nodeid, interface); } // @@ -1136,7 +1136,7 @@ AsciiTraceHelperForIpv6::EnableAsciiIpv6 (std::string prefix, uint32_t nodeid, u // void AsciiTraceHelperForIpv6::EnableAsciiIpv6Impl ( - Ptr stream, + Ptr stream, std::string prefix, uint32_t nodeid, uint32_t interface) diff --git a/src/helper/trace-helper.h b/src/helper/trace-helper.h index e0b9c2134..8f3b6b7de 100644 --- a/src/helper/trace-helper.h +++ b/src/helper/trace-helper.h @@ -26,7 +26,7 @@ #include "ns3/node-container.h" #include "ns3/simulator.h" #include "ns3/pcap-file-wrapper.h" -#include "ns3/output-stream-keeper.h" +#include "ns3/output-stream-wrapper.h" #include "ns3/ipv4.h" #include "ns3/ipv6.h" @@ -156,14 +156,14 @@ public: * that can solve the problem so we use one of those to carry the stream * around and deal with the lifetime issues. */ - Ptr CreateFileStream (std::string filename, std::string filemode = "w"); + Ptr CreateFileStream (std::string filename, std::string filemode = "w"); /** * @brief Hook a trace source to the default enqueue operation trace sink that * does not accept nor log a trace context. */ template - void HookDefaultEnqueueSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); + void HookDefaultEnqueueSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default enqueue operation trace sink that @@ -171,14 +171,14 @@ public: */ template void HookDefaultEnqueueSinkWithContext (Ptr object, - std::string context, std::string traceName, Ptr stream); + std::string context, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default drop operation trace sink that * does not accept nor log a trace context. */ template - void HookDefaultDropSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); + void HookDefaultDropSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default drop operation trace sink that @@ -186,14 +186,14 @@ public: */ template void HookDefaultDropSinkWithContext (Ptr object, - std::string context, std::string traceName, Ptr stream); + std::string context, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default dequeue operation trace sink * that does not accept nor log a trace context. */ template - void HookDefaultDequeueSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); + void HookDefaultDequeueSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default dequeue operation trace sink @@ -201,14 +201,14 @@ public: */ template void HookDefaultDequeueSinkWithContext (Ptr object, - std::string context, std::string traceName, Ptr stream); + std::string context, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default receive operation trace sink * that does not accept nor log a trace context. */ template - void HookDefaultReceiveSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); + void HookDefaultReceiveSinkWithoutContext (Ptr object, std::string traceName, Ptr stream); /** * @brief Hook a trace source to the default receive operation trace sink @@ -216,23 +216,23 @@ public: */ template void HookDefaultReceiveSinkWithContext (Ptr object, - std::string context, std::string traceName, Ptr stream); + std::string context, std::string traceName, Ptr stream); - static void DefaultEnqueueSinkWithoutContext (Ptr file, Ptr p); - static void DefaultEnqueueSinkWithContext (Ptr file, std::string context, Ptr p); + static void DefaultEnqueueSinkWithoutContext (Ptr file, Ptr p); + static void DefaultEnqueueSinkWithContext (Ptr file, std::string context, Ptr p); - static void DefaultDropSinkWithoutContext (Ptr file, Ptr p); - static void DefaultDropSinkWithContext (Ptr file, std::string context, Ptr p); + static void DefaultDropSinkWithoutContext (Ptr file, Ptr p); + static void DefaultDropSinkWithContext (Ptr file, std::string context, Ptr p); - static void DefaultDequeueSinkWithoutContext (Ptr file, Ptr p); - static void DefaultDequeueSinkWithContext (Ptr file, std::string context, Ptr p); + static void DefaultDequeueSinkWithoutContext (Ptr file, Ptr p); + static void DefaultDequeueSinkWithContext (Ptr file, std::string context, Ptr p); - static void DefaultReceiveSinkWithoutContext (Ptr file, Ptr p); - static void DefaultReceiveSinkWithContext (Ptr file, std::string context, Ptr p); + static void DefaultReceiveSinkWithoutContext (Ptr file, Ptr p); + static void DefaultReceiveSinkWithContext (Ptr file, std::string context, Ptr p); }; template void -AsciiTraceHelper::HookDefaultEnqueueSinkWithoutContext (Ptr object, std::string tracename, Ptr file) +AsciiTraceHelper::HookDefaultEnqueueSinkWithoutContext (Ptr object, std::string tracename, Ptr file) { bool __attribute__ ((unused)) result = object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultEnqueueSinkWithoutContext, file)); @@ -245,7 +245,7 @@ AsciiTraceHelper::HookDefaultEnqueueSinkWithContext ( Ptr object, std::string context, std::string tracename, - Ptr stream) + Ptr stream) { bool __attribute__ ((unused)) result = object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultEnqueueSinkWithContext, stream)); @@ -254,7 +254,7 @@ AsciiTraceHelper::HookDefaultEnqueueSinkWithContext ( } template void -AsciiTraceHelper::HookDefaultDropSinkWithoutContext (Ptr object, std::string tracename, Ptr file) +AsciiTraceHelper::HookDefaultDropSinkWithoutContext (Ptr object, std::string tracename, Ptr file) { bool __attribute__ ((unused)) result = object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultDropSinkWithoutContext, file)); @@ -267,7 +267,7 @@ AsciiTraceHelper::HookDefaultDropSinkWithContext ( Ptr object, std::string context, std::string tracename, - Ptr stream) + Ptr stream) { bool __attribute__ ((unused)) result = object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultDropSinkWithContext, stream)); @@ -276,7 +276,7 @@ AsciiTraceHelper::HookDefaultDropSinkWithContext ( } template void -AsciiTraceHelper::HookDefaultDequeueSinkWithoutContext (Ptr object, std::string tracename, Ptr file) +AsciiTraceHelper::HookDefaultDequeueSinkWithoutContext (Ptr object, std::string tracename, Ptr file) { bool __attribute__ ((unused)) result = object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultDequeueSinkWithoutContext, file)); @@ -289,7 +289,7 @@ AsciiTraceHelper::HookDefaultDequeueSinkWithContext ( Ptr object, std::string context, std::string tracename, - Ptr stream) + Ptr stream) { bool __attribute__ ((unused)) result = object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultDequeueSinkWithContext, stream)); @@ -298,7 +298,7 @@ AsciiTraceHelper::HookDefaultDequeueSinkWithContext ( } template void -AsciiTraceHelper::HookDefaultReceiveSinkWithoutContext (Ptr object, std::string tracename, Ptr file) +AsciiTraceHelper::HookDefaultReceiveSinkWithoutContext (Ptr object, std::string tracename, Ptr file) { bool __attribute__ ((unused)) result = object->TraceConnectWithoutContext (tracename, MakeBoundCallback (&DefaultReceiveSinkWithoutContext, file)); @@ -311,7 +311,7 @@ AsciiTraceHelper::HookDefaultReceiveSinkWithContext ( Ptr object, std::string context, std::string tracename, - Ptr stream) + Ptr stream) { bool __attribute__ ((unused)) result = object->TraceConnect (tracename, context, MakeBoundCallback (&DefaultReceiveSinkWithContext, stream)); @@ -405,8 +405,8 @@ public: * @brief Enable ascii trace output on the indicated net device. * @internal * - * The implementation is expected to use a provided Ptr - * if it is non-null. If the OutputStreamKeeper is null, the implementation + * The implementation is expected to use a provided Ptr + * if it is non-null. If the OutputStreamWrapper is null, the implementation * is expected to use a provided prefix to construct a new file name for * each net device using the rules described in the class overview. * @@ -419,12 +419,12 @@ public: * trace context could be important, so the device implementation is * expected to TraceConnect. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param prefix Filename prefix to use for ascii trace files. * @param nd Net device for which you want to enable tracing. */ - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) = 0; + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) = 0; /** * @brief Enable ascii trace output on the indicated net device. @@ -437,11 +437,11 @@ public: /** * @brief Enable ascii trace output on the indicated net device. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param nd Net device for which you want to enable tracing. */ - void EnableAscii (Ptr stream, Ptr nd); + void EnableAscii (Ptr stream, Ptr nd); /** * @brief Enable ascii trace output the indicated net device using a device @@ -456,11 +456,11 @@ public: * @brief Enable ascii trace output the indicated net device using a device * previously named using the ns-3 object name service. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param ndName The name of the net device in which you want to enable tracing. */ - void EnableAscii (Ptr stream, std::string ndName); + void EnableAscii (Ptr stream, std::string ndName); /** * @brief Enable ascii trace output on each device in the container which is @@ -475,11 +475,11 @@ public: * @brief Enable ascii trace output on each device in the container which is * of the appropriate type. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param d container of devices of type ns3::CsmaNetDevice */ - void EnableAscii (Ptr stream, NetDeviceContainer d); + void EnableAscii (Ptr stream, NetDeviceContainer d); /** * @brief Enable ascii trace output on each device (which is of the @@ -494,11 +494,11 @@ public: * @brief Enable ascii trace output on each device (which is of the * appropriate type) in the nodes provided in the container. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * \param n container of nodes. */ - void EnableAscii (Ptr stream, NodeContainer n); + void EnableAscii (Ptr stream, NodeContainer n); /** * @brief Enable ascii trace output on each device (which is of the @@ -512,10 +512,10 @@ public: * @brief Enable ascii trace output on each device (which is of the * appropriate type) in the set of all nodes created in the simulation. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. */ - void EnableAsciiAll (Ptr stream); + void EnableAsciiAll (Ptr stream); /** * @brief Enable ascii trace output on the device specified by a global @@ -533,40 +533,40 @@ public: * @brief Enable ascii trace output on the device specified by a global * node-id (of a previously created node) and associated device-id. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param nodeid The node identifier/number of the node on which to enable * ascii tracing * @param deviceid The device identifier/index of the device on which to enable * ascii tracing */ - void EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid); + void EnableAscii (Ptr stream, uint32_t nodeid, uint32_t deviceid); private: /** * @internal Avoid code duplication. */ - void EnableAsciiImpl (Ptr stream, std::string prefix, uint32_t nodeid, uint32_t deviceid); + void EnableAsciiImpl (Ptr stream, std::string prefix, uint32_t nodeid, uint32_t deviceid); /** * @internal Avoid code duplication. */ - void EnableAsciiImpl (Ptr stream, std::string prefix, NodeContainer n); + void EnableAsciiImpl (Ptr stream, std::string prefix, NodeContainer n); /** * @internal Avoid code duplication. */ - void EnableAsciiImpl (Ptr stream, std::string prefix, NetDeviceContainer d); + void EnableAsciiImpl (Ptr stream, std::string prefix, NetDeviceContainer d); /** * @internal Avoid code duplication. */ - void EnableAsciiImpl (Ptr stream, std::string prefix, std::string ndName); + void EnableAsciiImpl (Ptr stream, std::string prefix, std::string ndName); /** * @internal Avoid code duplication. */ - void EnableAsciiImpl (Ptr stream, std::string prefix, Ptr nd); + void EnableAsciiImpl (Ptr stream, std::string prefix, Ptr nd); }; @@ -654,8 +654,8 @@ public: * @brief Enable ascii trace output on the indicated Ipv4 and interface pair. * @internal * - * The implementation is expected to use a provided Ptr - * if it is non-null. If the OutputStreamKeeper is null, the implementation + * The implementation is expected to use a provided Ptr + * if it is non-null. If the OutputStreamWrapper is null, the implementation * is expected to use a provided prefix to construct a new file name for * each net device using the rules described in the class overview. * @@ -668,13 +668,13 @@ public: * context could be important, so the helper implementation is expected to * TraceConnect. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param prefix Filename prefix to use for ascii trace files. * @param ipv4 Ptr on which you want to enable tracing. * @param interface The interface on which you want to enable tracing. */ - virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, + virtual void EnableAsciiIpv4Internal (Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface) = 0; /** @@ -689,12 +689,12 @@ public: /** * @brief Enable ascii trace output on the indicated Ipv4 and interface pair. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param ipv4 Ptr on which you want to enable tracing. * @param interface The interface on which you want to enable tracing. */ - void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, Ptr ipv4, uint32_t interface); /** * @brief Enable ascii trace output the indicated Ipv4 and interface pair @@ -710,12 +710,12 @@ public: * @brief Enable ascii trace output the indicated net device using a device * previously named using the ns-3 object name service. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param ipv4Name The name of the Ipv4 on which you want to enable tracing. * @param interface The interface on which you want to enable tracing. */ - void EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, std::string ipv4Name, uint32_t interface); /** * @brief Enable ascii trace output on each Ipv4 and interface pair in the @@ -731,12 +731,12 @@ public: * @brief Enable ascii trace output on each device in the container which is * of the appropriate type. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param c Ipv4InterfaceContainer of Ipv4 and interface pairs on which to * enable tracing. */ - void EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c); + void EnableAsciiIpv4 (Ptr stream, Ipv4InterfaceContainer c); /** * @brief Enable ascii trace output on all Ipv4 and interface pairs existing @@ -751,11 +751,11 @@ public: * @brief Enable ascii trace output on all Ipv4 and interface pairs existing * in the nodes provided in the container. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * \param n container of nodes. */ - void EnableAsciiIpv4 (Ptr stream, NodeContainer n); + void EnableAsciiIpv4 (Ptr stream, NodeContainer n); /** * @brief Enable ascii trace output on all Ipv4 and interface pairs existing @@ -769,10 +769,10 @@ public: * @brief Enable ascii trace output on each device (which is of the * appropriate type) in the set of all nodes created in the simulation. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. */ - void EnableAsciiIpv4All (Ptr stream); + void EnableAsciiIpv4All (Ptr stream); /** * @brief Enable pcap output on the Ipv4 and interface pair specified by a @@ -794,39 +794,39 @@ public: * can be only one Ipv4 aggregated to a node, the node-id unambiguously * determines the Ipv4. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param nodeid The node identifier/number of the node on which to enable * ascii tracing * @param interface The interface on which you want to enable tracing. */ - void EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface); + void EnableAsciiIpv4 (Ptr stream, uint32_t nodeid, uint32_t interface); private: /** * @internal Avoid code duplication. */ - void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, uint32_t nodeid, uint32_t interface); + void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, uint32_t nodeid, uint32_t interface); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, NodeContainer n); + void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, NodeContainer n); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, Ipv4InterfaceContainer c); + void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, Ipv4InterfaceContainer c); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, std::string ipv4Name, uint32_t interface); + void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, std::string ipv4Name, uint32_t interface); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface); + void EnableAsciiIpv4Impl (Ptr stream, std::string prefix, Ptr ipv4, uint32_t interface); }; @@ -913,8 +913,8 @@ public: * @brief Enable ascii trace output on the indicated Ipv6 and interface pair. * @internal * - * The implementation is expected to use a provided Ptr - * if it is non-null. If the OutputStreamKeeper is null, the implementation + * The implementation is expected to use a provided Ptr + * if it is non-null. If the OutputStreamWrapper is null, the implementation * is expected to use a provided prefix to construct a new file name for * each net device using the rules described in the class overview. * @@ -927,13 +927,13 @@ public: * context could be important, so the helper implementation is expected to * TraceConnect. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param prefix Filename prefix to use for ascii trace files. * @param ipv6 Ptr on which you want to enable tracing. * @param interface The interface on which you want to enable tracing. */ - virtual void EnableAsciiIpv6Internal (Ptr stream, std::string prefix, + virtual void EnableAsciiIpv6Internal (Ptr stream, std::string prefix, Ptr ipv6, uint32_t interface) = 0; /** @@ -949,12 +949,12 @@ public: /** * @brief Enable ascii trace output on the indicated Ipv6 and interface pair. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param ipv6 Ptr on which you want to enable tracing. * @param interface The interface on which you want to enable tracing. */ - void EnableAsciiIpv6 (Ptr stream, + void EnableAsciiIpv6 (Ptr stream, Ptr ipv6, uint32_t interface); /** @@ -972,12 +972,12 @@ public: * @brief Enable ascii trace output the indicated net device using a device * previously named using the ns-3 object name service. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param ipv6Name The name of the Ipv6 on which you want to enable tracing. * @param interface The interface on which you want to enable tracing. */ - void EnableAsciiIpv6 (Ptr stream, + void EnableAsciiIpv6 (Ptr stream, std::string ipv6Name, uint32_t interface); /** @@ -994,12 +994,12 @@ public: * @brief Enable ascii trace output on each device in the container which is * of the appropriate type. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param c Ipv6InterfaceContainer of Ipv6 and interface pairs on which to * enable tracing. */ - void EnableAsciiIpv6 (Ptr stream, Ipv6InterfaceContainer c); + void EnableAsciiIpv6 (Ptr stream, Ipv6InterfaceContainer c); /** * @brief Enable ascii trace output on all Ipv6 and interface pairs existing @@ -1014,11 +1014,11 @@ public: * @brief Enable ascii trace output on all Ipv6 and interface pairs existing * in the nodes provided in the container. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * \param n container of nodes. */ - void EnableAsciiIpv6 (Ptr stream, NodeContainer n); + void EnableAsciiIpv6 (Ptr stream, NodeContainer n); /** * @brief Enable pcap output on the Ipv6 and interface pair specified by a @@ -1040,13 +1040,13 @@ public: * can be only one Ipv6 aggregated to a node, the node-id unambiguously * determines the Ipv6. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. * @param nodeid The node identifier/number of the node on which to enable * ascii tracing * @param interface The interface on which you want to enable tracing. */ - void EnableAsciiIpv6 (Ptr stream, uint32_t nodeid, uint32_t interface); + void EnableAsciiIpv6 (Ptr stream, uint32_t nodeid, uint32_t interface); /** * @brief Enable ascii trace output on all Ipv6 and interface pairs existing @@ -1060,36 +1060,36 @@ public: * @brief Enable ascii trace output on each device (which is of the * appropriate type) in the set of all nodes created in the simulation. * - * @param stream An OutputStreamKeeper representing an existing file to use + * @param stream An OutputStreamWrapper representing an existing file to use * when writing trace data. */ - void EnableAsciiIpv6All (Ptr stream); + void EnableAsciiIpv6All (Ptr stream); private: /** * @internal Avoid code duplication. */ - void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, uint32_t nodeid, uint32_t interface); + void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, uint32_t nodeid, uint32_t interface); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, NodeContainer n); + void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, NodeContainer n); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, Ipv6InterfaceContainer c); + void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, Ipv6InterfaceContainer c); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, std::string ipv6Name, uint32_t interface); + void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, std::string ipv6Name, uint32_t interface); /** * @internal Avoid code duplication. */ - void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, Ptr ipv6, uint32_t interface); + void EnableAsciiIpv6Impl (Ptr stream, std::string prefix, Ptr ipv6, uint32_t interface); }; diff --git a/src/helper/yans-wifi-helper.cc b/src/helper/yans-wifi-helper.cc index d0e6f1ed2..e87343dc8 100644 --- a/src/helper/yans-wifi-helper.cc +++ b/src/helper/yans-wifi-helper.cc @@ -40,7 +40,7 @@ namespace ns3 { static void AsciiPhyTransmitSinkWithContext ( - Ptr stream, + Ptr stream, std::string context, Ptr p, WifiMode mode, @@ -53,7 +53,7 @@ AsciiPhyTransmitSinkWithContext ( static void AsciiPhyTransmitSinkWithoutContext ( - Ptr stream, + Ptr stream, Ptr p, WifiMode mode, WifiPreamble preamble, @@ -65,7 +65,7 @@ AsciiPhyTransmitSinkWithoutContext ( static void AsciiPhyReceiveSinkWithContext ( - Ptr stream, + Ptr stream, std::string context, Ptr p, double snr, @@ -78,7 +78,7 @@ AsciiPhyReceiveSinkWithContext ( static void AsciiPhyReceiveSinkWithoutContext ( - Ptr stream, + Ptr stream, Ptr p, double snr, WifiMode mode, @@ -407,7 +407,7 @@ YansWifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr nd, bo } void -YansWifiPhyHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) +YansWifiPhyHelper::EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd) { // // All of the ascii enable functions vector through here including the ones @@ -432,7 +432,7 @@ YansWifiPhyHelper::EnableAsciiInternal (Ptr stream, std::str std::ostringstream oss; // - // If we are not provided an OutputStreamKeeper, we are expected to create + // If we are not provided an OutputStreamWrapper, we are expected to create // one using the usual trace filename conventions and write our traces // without a context since there will be one file per context and therefore // the context would be redundant. @@ -446,7 +446,7 @@ YansWifiPhyHelper::EnableAsciiInternal (Ptr stream, std::str // AsciiTraceHelper asciiTraceHelper; std::string filename = asciiTraceHelper.GetFilenameFromDevice (prefix, device); - Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); + Ptr theStream = asciiTraceHelper.CreateFileStream (filename, "w"); // // We could go poking through the phy and the state looking for the @@ -466,7 +466,7 @@ YansWifiPhyHelper::EnableAsciiInternal (Ptr stream, std::str } // - // If we are provided an OutputStreamKeeper, we are expected to use it, and + // If we are provided an OutputStreamWrapper, we are expected to use it, and // to provide a context. We are free to come up with our own context if we // want, and use the AsciiTraceHelper Hook*WithContext functions, but for // compatibility and simplicity, we just use Config::Connect and let it deal diff --git a/src/helper/yans-wifi-helper.h b/src/helper/yans-wifi-helper.h index 435e2a2fd..9093044e0 100644 --- a/src/helper/yans-wifi-helper.h +++ b/src/helper/yans-wifi-helper.h @@ -256,7 +256,7 @@ private: * \param prefix Filename prefix to use for ascii trace files. * \param nd Net device for which you want to enable tracing. */ - virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); + virtual void EnableAsciiInternal (Ptr stream, std::string prefix, Ptr nd); ObjectFactory m_phy; ObjectFactory m_errorRateModel;