From 6c05ba06ffeb6ecd991ba354e0f5b04417d701ff Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 6 Sep 2007 13:32:29 +0200 Subject: [PATCH] rename ConnectPrinterToAll to TraceAll --- examples/simple-point-to-point.cc | 2 +- src/core/array-trace-resolver.h | 6 +++--- src/core/composite-trace-resolver.cc | 16 ++++++++-------- src/core/composite-trace-resolver.h | 8 ++++---- src/core/object.cc | 10 +++++----- src/core/object.h | 2 +- src/core/trace-resolver.h | 2 +- src/node/node-list.cc | 4 ++-- src/node/node-list.h | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/simple-point-to-point.cc b/examples/simple-point-to-point.cc index 91a1f45e1..852d9c420 100644 --- a/examples/simple-point-to-point.cc +++ b/examples/simple-point-to-point.cc @@ -179,7 +179,7 @@ int main (int argc, char *argv[]) asciitrace.TraceAllQueues (); asciitrace.TraceAllNetDeviceRx (); - NodeList::ConnectPrinterToAll (std::cout); + NodeList::TraceAll (std::cout); // Also configure some tcpdump traces; each interface will be traced // The output files will be named diff --git a/src/core/array-trace-resolver.h b/src/core/array-trace-resolver.h index d5bc2ca32..ecbc63d5d 100644 --- a/src/core/array-trace-resolver.h +++ b/src/core/array-trace-resolver.h @@ -64,7 +64,7 @@ public: virtual void Disconnect (std::string path, CallbackBase const &cb); virtual void CollectSources (std::string path, const TraceContext &context, SourceCollection *collection); - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context); + virtual void TraceAll (std::ostream &os, const TraceContext &context); private: class IteratorBase @@ -186,7 +186,7 @@ ArrayTraceResolver::CollectSources (std::string path, const TraceContext template void -ArrayTraceResolver::ConnectPrinterToAll (std::ostream &os, const TraceContext &context) +ArrayTraceResolver::TraceAll (std::ostream &os, const TraceContext &context) { uint32_t j = 0; for (m_iter->Rewind (); m_iter->HasNext (); m_iter->Next ()) @@ -195,7 +195,7 @@ ArrayTraceResolver::ConnectPrinterToAll (std::ostream &os, const TraceCon INDEX index = j; tmp.AddElement (index); Ptr obj = m_iter->Get (); - obj->GetTraceResolver ()->ConnectPrinterToAll (os, tmp); + obj->GetTraceResolver ()->TraceAll (os, tmp); j++; } } diff --git a/src/core/composite-trace-resolver.cc b/src/core/composite-trace-resolver.cc index 377da45b5..bf59054f2 100644 --- a/src/core/composite-trace-resolver.cc +++ b/src/core/composite-trace-resolver.cc @@ -63,11 +63,11 @@ CompositeTraceResolver::Add (std::string name, ctx.Union (this->context); this->maker ()->CollectSources (path, ctx, collection); } - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) + virtual void TraceAll (std::ostream &os, const TraceContext &context) { TraceContext ctx = context; ctx.Union (this->context); - this->maker ()->ConnectPrinterToAll (os, ctx); + this->maker ()->TraceAll (os, ctx); } Callback > maker; } *item = new MakerResolveItem (); @@ -107,7 +107,7 @@ CompositeTraceResolver::DoAddSource (std::string name, ctx.Union (this->context); collection->AddUnique (path, ctx, this->doc); } - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) + virtual void TraceAll (std::ostream &os, const TraceContext &context) { TraceContext ctx = context; ctx.Union (this->context); @@ -150,11 +150,11 @@ CompositeTraceResolver::DoAddComposite (std::string name, Ptr composite, ctx.Union (this->context); this->composite->GetTraceResolver ()->CollectSources (path, ctx, collection); } - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) + virtual void TraceAll (std::ostream &os, const TraceContext &context) { TraceContext ctx = context; ctx.Union (this->context); - this->composite->GetTraceResolver ()->ConnectPrinterToAll (os, ctx); + this->composite->GetTraceResolver ()->TraceAll (os, ctx); } Ptr composite; @@ -312,16 +312,16 @@ CompositeTraceResolver::CollectSources (std::string path, const TraceContext &co } } void -CompositeTraceResolver::ConnectPrinterToAll (std::ostream &os, const TraceContext &context) +CompositeTraceResolver::TraceAll (std::ostream &os, const TraceContext &context) { for (TraceItems::const_iterator i = m_items.begin (); i != m_items.end (); i++) { NS_DEBUG ("print " << (*i)->name); - (*i)->ConnectPrinterToAll (os, context); + (*i)->TraceAll (os, context); } if (m_parent != 0) { - m_parent->ConnectPrinterToAll (os, context); + m_parent->TraceAll (os, context); } } diff --git a/src/core/composite-trace-resolver.h b/src/core/composite-trace-resolver.h index c0612151f..ceca4044a 100644 --- a/src/core/composite-trace-resolver.h +++ b/src/core/composite-trace-resolver.h @@ -120,7 +120,7 @@ private: virtual void Disconnect (std::string path, CallbackBase const &cb); virtual void CollectSources (std::string path, const TraceContext &context, SourceCollection *collection); - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context); + virtual void TraceAll (std::ostream &os, const TraceContext &context); friend class CompositeTraceResolverTest; class ResolveItem { @@ -130,7 +130,7 @@ private: virtual void Disconnect (std::string subpath, const CallbackBase &cb) = 0; virtual void CollectSources (std::string path, const TraceContext &context, SourceCollection *collection) = 0; - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) = 0; + virtual void TraceAll (std::ostream &os, const TraceContext &context) = 0; std::string name; TraceContext context; @@ -201,11 +201,11 @@ CompositeTraceResolver::AddArray (std::string name, ctx.Union (this->context); array->CollectSources (path, ctx, collection); } - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) + virtual void TraceAll (std::ostream &os, const TraceContext &context) { TraceContext ctx = context; ctx.Union (this->context); - array->ConnectPrinterToAll (os, ctx); + array->TraceAll (os, ctx); } Ptr > array; diff --git a/src/core/object.cc b/src/core/object.cc index ce87c0f63..27ac31917 100644 --- a/src/core/object.cc +++ b/src/core/object.cc @@ -68,7 +68,7 @@ public: virtual void Disconnect (std::string path, CallbackBase const &cb); virtual void CollectSources (std::string path, const TraceContext &context, SourceCollection *collection); - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context); + virtual void TraceAll (std::ostream &os, const TraceContext &context); private: Ptr ParseForInterface (std::string path); Ptr m_aggregate; @@ -116,9 +116,9 @@ InterfaceIdTraceResolver::CollectSources (std::string path, const TraceContext & m_aggregate->DoCollectSources (path, context, collection); } void -InterfaceIdTraceResolver::ConnectPrinterToAll (std::ostream &os, const TraceContext &context) +InterfaceIdTraceResolver::TraceAll (std::ostream &os, const TraceContext &context) { - m_aggregate->DoConnectPrinterToAll (os, context); + m_aggregate->DoTraceAll (os, context); } @@ -340,7 +340,7 @@ Object::DoCollectSources (std::string path, const TraceContext &context, m_collecting = false; } void -Object::DoConnectPrinterToAll (std::ostream &os, const TraceContext &context) const +Object::DoTraceAll (std::ostream &os, const TraceContext &context) const { const Object *current; current = this; @@ -358,7 +358,7 @@ Object::DoConnectPrinterToAll (std::ostream &os, const TraceContext &context) co while (current != this) { NS_ASSERT (current != 0); - current->GetTraceResolver ()->ConnectPrinterToAll (os, context); + current->GetTraceResolver ()->TraceAll (os, context); current = current->m_next; } diff --git a/src/core/object.h b/src/core/object.h index 9cc5a0f68..36aa3a384 100644 --- a/src/core/object.h +++ b/src/core/object.h @@ -184,7 +184,7 @@ private: Ptr DoQueryInterface (InterfaceId iid) const; void DoCollectSources (std::string path, const TraceContext &context, TraceResolver::SourceCollection *collection) const; - void DoConnectPrinterToAll (std::ostream &os, const TraceContext &context) const; + void DoTraceAll (std::ostream &os, const TraceContext &context) const; bool Check (void) const; void MaybeDelete (void) const; mutable uint32_t m_count; diff --git a/src/core/trace-resolver.h b/src/core/trace-resolver.h index f3e0d101a..3db2b42c3 100644 --- a/src/core/trace-resolver.h +++ b/src/core/trace-resolver.h @@ -101,7 +101,7 @@ public: virtual void CollectSources (std::string path, const TraceContext &context, SourceCollection *collection) = 0; - virtual void ConnectPrinterToAll (std::ostream &os, const TraceContext &context) = 0; + virtual void TraceAll (std::ostream &os, const TraceContext &context) = 0; protected: /** * \param path a namespace path diff --git a/src/node/node-list.cc b/src/node/node-list.cc index 95a009bbb..1accfa2be 100644 --- a/src/node/node-list.cc +++ b/src/node/node-list.cc @@ -172,9 +172,9 @@ NodeList::Disconnect (std::string name, const CallbackBase &cb) SimulationSingleton::Get ()->GetTraceResolver ()->Disconnect (name, cb); } void -NodeList::ConnectPrinterToAll (std::ostream &os) +NodeList::TraceAll (std::ostream &os) { - SimulationSingleton::Get ()->GetTraceResolver ()->ConnectPrinterToAll (os, TraceContext ()); + SimulationSingleton::Get ()->GetTraceResolver ()->TraceAll (os, TraceContext ()); } Ptr NodeList::GetTraceResolver (void) diff --git a/src/node/node-list.h b/src/node/node-list.h index 02c638bbf..dc0e69d8c 100644 --- a/src/node/node-list.h +++ b/src/node/node-list.h @@ -101,7 +101,7 @@ public: * the input namespace regexp. */ static void Disconnect (std::string name, const CallbackBase &cb); - static void ConnectPrinterToAll (std::ostream &os); + static void TraceAll (std::ostream &os); static Ptr GetTraceResolver (void); private: };