diff --git a/src/core/object.cc b/src/core/object.cc index a5c061cbf..8eec87aee 100644 --- a/src/core/object.cc +++ b/src/core/object.cc @@ -21,7 +21,6 @@ #include "object.h" #include "assert.h" #include "singleton.h" -#include "trace-resolver.h" #include "attribute.h" #include "trace-source-accessor.h" #include "log.h" @@ -373,73 +372,8 @@ IidManager::GetTraceSourceAccessor (uint16_t uid, uint32_t i) const } // anonymous namespace -/********************************************************************* - * The TypeId TraceResolver - *********************************************************************/ - namespace ns3 { -class TypeIdTraceResolver : public TraceResolver -{ -public: - TypeIdTraceResolver (Ptr aggregate); - virtual void Connect (std::string path, CallbackBase const &cb, const TraceContext &context); - virtual void Disconnect (std::string path, CallbackBase const &cb); - virtual void CollectSources (std::string path, const TraceContext &context, - SourceCollection *collection); - virtual void TraceAll (std::ostream &os, const TraceContext &context); -private: - Ptr ParseForInterface (std::string path); - Ptr m_aggregate; -}; - -TypeIdTraceResolver::TypeIdTraceResolver (Ptr aggregate) - : m_aggregate (aggregate) -{} -Ptr -TypeIdTraceResolver::ParseForInterface (std::string path) -{ - std::string element = GetElement (path); - std::string::size_type dollar_pos = element.find ("$"); - if (dollar_pos != 0) - { - return 0; - } - std::string interfaceName = element.substr (1, std::string::npos); - TypeId interfaceId = TypeId::LookupByName (interfaceName); - Ptr interface = m_aggregate->GetObject (interfaceId); - return interface; -} -void -TypeIdTraceResolver::Connect (std::string path, CallbackBase const &cb, const TraceContext &context) -{ - Ptr interface = ParseForInterface (path); - if (interface != 0) - { - interface->GetTraceResolver ()->Connect (GetSubpath (path), cb, context); - } -} -void -TypeIdTraceResolver::Disconnect (std::string path, CallbackBase const &cb) -{ - Ptr interface = ParseForInterface (path); - if (interface != 0) - { - interface->TraceDisconnect (GetSubpath (path), cb); - } -} -void -TypeIdTraceResolver::CollectSources (std::string path, const TraceContext &context, - SourceCollection *collection) -{ - m_aggregate->DoCollectSources (path, context, collection); -} -void -TypeIdTraceResolver::TraceAll (std::ostream &os, const TraceContext &context) -{ - m_aggregate->DoTraceAll (os, context); -} - /********************************************************************* * The TypeId class *********************************************************************/ @@ -1252,19 +1186,6 @@ Object::AggregateObject (Ptr o) NS_ASSERT (o->CheckLoose ()); } -void -Object::TraceConnect (std::string path, const CallbackBase &cb) const -{ - NS_ASSERT (CheckLoose ()); - GetTraceResolver ()->Connect (path, cb, TraceContext ()); -} -void -Object::TraceDisconnect (std::string path, const CallbackBase &cb) const -{ - NS_ASSERT (CheckLoose ()); - GetTraceResolver ()->Disconnect (path, cb); -} - void Object::SetTypeId (TypeId tid) { @@ -1278,14 +1199,6 @@ Object::DoDispose (void) NS_ASSERT (!m_disposed); } -Ptr -Object::GetTraceResolver (void) const -{ - NS_ASSERT (CheckLoose ()); - Ptr resolver = - Create (this); - return resolver; -} bool Object::Check (void) const @@ -1354,77 +1267,12 @@ Object::MaybeDelete (void) const } while (current != end); } -void -Object::DoCollectSources (std::string path, const TraceContext &context, - TraceResolver::SourceCollection *collection) const -{ - const Object *current; - current = this; - do { - if (current->m_collecting) - { - return; - } - current = current->m_next; - } while (current != this); - - m_collecting = true; - - current = this->m_next; - while (current != this) - { - NS_ASSERT (current != 0); - NS_LOG_LOGIC ("collect current=" << current); - TypeId cur = current->m_tid; - while (cur != Object::GetTypeId ()) - { - std::string name = cur.GetName (); - std::string fullpath = path; - fullpath.append ("/$"); - fullpath.append (name); - NS_LOG_LOGIC("collect: " << fullpath); - current->GetTraceResolver ()->CollectSources (fullpath, context, collection); - cur = cur.GetParent (); - } - current = current->m_next; - } - - m_collecting = false; -} -void -Object::DoTraceAll (std::ostream &os, const TraceContext &context) const -{ - const Object *current; - current = this; - do { - if (current->m_collecting) - { - return; - } - current = current->m_next; - } while (current != this); - - m_collecting = true; - - current = this->m_next; - while (current != this) - { - NS_ASSERT (current != 0); - current->GetTraceResolver ()->TraceAll (os, context); - current = current->m_next; - } - - m_collecting = false; -} - } // namespace ns3 #ifdef RUN_SELF_TESTS #include "test.h" -#include "sv-trace-source.h" -#include "composite-trace-resolver.h" namespace { @@ -1439,18 +1287,7 @@ public: } BaseA () {} - void BaseGenerateTrace (int16_t v) - { m_source = v; } virtual void Dispose (void) {} - virtual ns3::Ptr GetTraceResolver (void) const - { - ns3::Ptr resolver = - ns3::Create (); - resolver->AddSource ("basea-x", ns3::TraceDoc ("test source"), m_source); - resolver->SetParentResolver (Object::GetTraceResolver ()); - return resolver; - } - ns3::SVTraceSource m_source; }; class DerivedA : public BaseA @@ -1464,20 +1301,9 @@ public: } DerivedA () {} - void DerivedGenerateTrace (int16_t v) - { m_sourceDerived = v; } virtual void Dispose (void) { BaseA::Dispose (); } - virtual ns3::Ptr GetTraceResolver (void) const - { - ns3::Ptr resolver = - ns3::Create (); - resolver->AddSource ("deriveda-x", ns3::TraceDoc ("test source"), m_sourceDerived); - resolver->SetParentResolver (BaseA::GetTraceResolver ()); - return resolver; - } - ns3::SVTraceSource m_sourceDerived; }; class BaseB : public ns3::Object @@ -1491,18 +1317,7 @@ public: } BaseB () {} - void BaseGenerateTrace (int16_t v) - { m_source = v; } virtual void Dispose (void) {} - virtual ns3::Ptr GetTraceResolver (void) const - { - ns3::Ptr resolver = - ns3::Create (); - resolver->AddSource ("baseb-x", ns3::TraceDoc ("test source"), m_source); - resolver->SetParentResolver (Object::GetTraceResolver ()); - return resolver; - } - ns3::SVTraceSource m_source; }; class DerivedB : public BaseB @@ -1516,20 +1331,9 @@ public: } DerivedB () {} - void DerivedGenerateTrace (int16_t v) - { m_sourceDerived = v; } virtual void Dispose (void) { BaseB::Dispose (); } - virtual ns3::Ptr GetTraceResolver (void) const - { - ns3::Ptr resolver = - ns3::Create (); - resolver->AddSource ("derivedb-x", ns3::TraceDoc ("test source"), m_sourceDerived); - resolver->SetParentResolver (BaseB::GetTraceResolver ()); - return resolver; - } - ns3::SVTraceSource m_sourceDerived; }; NS_OBJECT_ENSURE_REGISTERED (BaseA); @@ -1546,41 +1350,11 @@ class ObjectTest : public Test public: ObjectTest (); virtual bool RunTests (void); -private: - void BaseATrace (const TraceContext &context, int64_t oldValue, int64_t newValue); - void DerivedATrace (const TraceContext &context, int64_t oldValue, int64_t newValue); - void BaseBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue); - void DerivedBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue); - - bool m_baseATrace; - bool m_derivedATrace; - bool m_baseBTrace; - bool m_derivedBTrace; }; ObjectTest::ObjectTest () : Test ("Object") {} -void -ObjectTest::BaseATrace (const TraceContext &context, int64_t oldValue, int64_t newValue) -{ - m_baseATrace = true; -} -void -ObjectTest::DerivedATrace (const TraceContext &context, int64_t oldValue, int64_t newValue) -{ - m_derivedATrace = true; -} -void -ObjectTest::BaseBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue) -{ - m_baseBTrace = true; -} -void -ObjectTest::DerivedBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue) -{ - m_derivedBTrace = true; -} bool ObjectTest::RunTests (void) @@ -1629,74 +1403,6 @@ ObjectTest::RunTests (void) baseA = 0; baseA = baseB->GetObject (); - baseA = CreateObject (); - baseA->TraceConnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - m_baseATrace = false; - baseA->BaseGenerateTrace (1); - NS_TEST_ASSERT (m_baseATrace); - baseA->TraceDisconnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - - baseB = CreateObject (); - baseB->TraceConnect ("/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); - m_baseBTrace = false; - baseB->BaseGenerateTrace (2); - NS_TEST_ASSERT (m_baseBTrace); - baseB->TraceDisconnect ("/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); - - baseA->AggregateObject (baseB); - - baseA->TraceConnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - m_baseATrace = false; - baseA->BaseGenerateTrace (3); - NS_TEST_ASSERT (m_baseATrace); - baseA->TraceDisconnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - - baseA->TraceConnect ("/$BaseB/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); - m_baseBTrace = false; - baseB->BaseGenerateTrace (4); - NS_TEST_ASSERT (m_baseBTrace); - baseA->TraceDisconnect ("/$BaseB/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); - m_baseBTrace = false; - baseB->BaseGenerateTrace (5); - NS_TEST_ASSERT (!m_baseBTrace); - - baseB->TraceConnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - m_baseATrace = false; - baseA->BaseGenerateTrace (6); - NS_TEST_ASSERT (m_baseATrace); - baseB->TraceDisconnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - - baseA->TraceConnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - m_baseATrace = false; - baseA->BaseGenerateTrace (7); - NS_TEST_ASSERT (m_baseATrace); - baseA->TraceDisconnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - - Ptr derivedA; - derivedA = CreateObject (); - baseB = CreateObject (); - derivedA->AggregateObject (baseB); - baseB->TraceConnect ("/$DerivedA/deriveda-x", MakeCallback (&ObjectTest::DerivedATrace, this)); - baseB->TraceConnect ("/$DerivedA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - m_derivedATrace = false; - m_baseATrace = false; - derivedA->DerivedGenerateTrace (8); - derivedA->BaseGenerateTrace (9); - NS_TEST_ASSERT (m_derivedATrace); - NS_TEST_ASSERT (m_baseATrace); - baseB->TraceDisconnect ("/$DerivedA/deriveda-x", MakeCallback (&ObjectTest::BaseATrace, this)); - baseB->TraceDisconnect ("/$DerivedA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); - - baseB->TraceConnect ("/$DerivedA/*", MakeCallback (&ObjectTest::DerivedATrace, this)); - m_derivedATrace = false; - derivedA->DerivedGenerateTrace (10); - NS_TEST_ASSERT (m_derivedATrace); - // here, we have connected the derived trace sink to all - // trace sources, including the base trace source. - m_derivedATrace = false; - derivedA->BaseGenerateTrace (11); - NS_TEST_ASSERT (m_derivedATrace); - baseB->TraceDisconnect ("/$DerivedA/*", MakeCallback (&ObjectTest::BaseATrace, this)); // Test the object creation code of TypeId Ptr a = BaseA::GetTypeId ().CreateObject (); diff --git a/src/core/object.h b/src/core/object.h index fd299614f..95123dac4 100644 --- a/src/core/object.h +++ b/src/core/object.h @@ -23,8 +23,8 @@ #include #include +#include #include "ptr.h" -#include "trace-resolver.h" #include "callback.h" #include "attribute.h" #include "object-base.h" @@ -42,7 +42,6 @@ namespace ns3 { -class TraceContext; class CallbackBase; class Object; class AttributeAccessor; @@ -444,29 +443,6 @@ public: */ void AggregateObject (Ptr other); - /** - * \param path the path to match for the callback - * \param cb callback to connect - * - * Connect the input callback to all trace sources which - * match the input path. - * - */ - void TraceConnect (std::string path, const CallbackBase &cb) const; - /** - * \param path the path to match for the callback - * \param cb callback to disconnect - * - * Disconnect the input callback from all trace sources which - * match the input path. - */ - void TraceDisconnect (std::string path, const CallbackBase &cb) const; - /** - * \returns the trace resolver associated to this object. - * - * This method should be rarely called by users. - */ - virtual Ptr GetTraceResolver (void) const; protected: /** * This method is called by Object::Dispose. @@ -476,8 +452,6 @@ protected: virtual void DoDispose (void); virtual void NotifyConstructionCompleted (void); private: - friend class TypeIdTraceResolver; - template friend Ptr CreateObject (const AttributeList &attributes); @@ -502,9 +476,6 @@ private: bool DoSet (Ptr spec, Attribute intialValue, Ptr checker, Attribute value); Ptr DoGetObject (TypeId tid) const; - void DoCollectSources (std::string path, const TraceContext &context, - TraceResolver::SourceCollection *collection) const; - void DoTraceAll (std::ostream &os, const TraceContext &context) const; bool Check (void) const; bool CheckLoose (void) const; /** diff --git a/src/core/wscript b/src/core/wscript index 92e004f11..6fd2a5404 100644 --- a/src/core/wscript +++ b/src/core/wscript @@ -42,16 +42,7 @@ def build(bld): 'command-line.cc', 'type-name.cc', 'random-variable-default-value.cc', - 'variable-tracer-test.cc', - 'trace-context.cc', - 'trace-context-element.cc', - 'trace-resolver.cc', - 'callback-trace-source.cc', - 'composite-trace-resolver.cc', - 'trace-doc.cc', - 'trace-source.cc', 'type-traits-test.cc', - 'array-trace-resolver.cc', 'type-id-default-value.cc', 'attribute.cc', 'boolean.cc', @@ -98,17 +89,6 @@ def build(bld): 'type-name.h', 'type-traits.h', 'random-variable-default-value.h', - 'trace-source.h', - 'uv-trace-source.h', - 'sv-trace-source.h', - 'fv-trace-source.h', - 'callback-trace-source.h', - 'trace-context.h', - 'trace-context-element.h', - 'trace-resolver.h', - 'composite-trace-resolver.h', - 'array-trace-resolver.h', - 'trace-doc.h', 'int-to-type.h', 'type-id-default-value.h', 'attribute.h', diff --git a/src/devices/wifi/mac-low.cc b/src/devices/wifi/mac-low.cc index a3f6c7e56..372bf4121 100644 --- a/src/devices/wifi/mac-low.cc +++ b/src/devices/wifi/mac-low.cc @@ -31,7 +31,6 @@ #include "wifi-mac.h" #include "mac-stations.h" #include "wifi-mac-parameters.h" -#include "ns3/composite-trace-resolver.h" NS_LOG_COMPONENT_DEFINE ("MacLow"); diff --git a/src/internet-node/arp-l3-protocol.h b/src/internet-node/arp-l3-protocol.h index 206dc1f7e..0c86a5bb6 100644 --- a/src/internet-node/arp-l3-protocol.h +++ b/src/internet-node/arp-l3-protocol.h @@ -32,7 +32,6 @@ class ArpCache; class NetDevice; class Node; class Packet; -class TraceResolver; class TraceContext; /** * \brief An implementation of the ARP protocol diff --git a/src/internet-node/ascii-trace.cc b/src/internet-node/ascii-trace.cc index 2253d0322..215c23731 100644 --- a/src/internet-node/ascii-trace.cc +++ b/src/internet-node/ascii-trace.cc @@ -21,7 +21,6 @@ #include "ascii-trace.h" #include "ns3/config.h" -#include "ns3/trace-context.h" #include "ns3/simulator.h" #include "ns3/node.h" #include "ns3/packet.h" diff --git a/src/internet-node/ipv4-interface.cc b/src/internet-node/ipv4-interface.cc index 5d9c90a8e..e016912f0 100644 --- a/src/internet-node/ipv4-interface.cc +++ b/src/internet-node/ipv4-interface.cc @@ -22,7 +22,6 @@ #include "ipv4-interface.h" #include "ns3/ipv4-address.h" #include "ns3/net-device.h" -#include "ns3/trace-resolver.h" #include "ns3/log.h" #include "ns3/packet.h" diff --git a/src/internet-node/ipv4-interface.h b/src/internet-node/ipv4-interface.h index 9b0f517c2..3114a05d8 100644 --- a/src/internet-node/ipv4-interface.h +++ b/src/internet-node/ipv4-interface.h @@ -32,7 +32,6 @@ namespace ns3 { class NetDevice; class Packet; -class TraceResolver; class TraceContext; /** diff --git a/src/internet-node/ipv4-static-routing.h b/src/internet-node/ipv4-static-routing.h index 8d92c49e7..19980f4ed 100644 --- a/src/internet-node/ipv4-static-routing.h +++ b/src/internet-node/ipv4-static-routing.h @@ -25,8 +25,6 @@ #include #include -#include "ns3/callback-trace-source.h" -#include "ns3/array-trace-resolver.h" #include "ns3/ipv4-address.h" #include "ipv4-header.h" #include "ns3/ptr.h" @@ -41,8 +39,6 @@ class Ipv4Address; class Ipv4Header; class Ipv4Route; class Node; -class TraceResolver; -class TraceContext; /** diff --git a/src/internet-node/tcp-l4-protocol.h b/src/internet-node/tcp-l4-protocol.h index a70cf121b..73bfb8e97 100644 --- a/src/internet-node/tcp-l4-protocol.h +++ b/src/internet-node/tcp-l4-protocol.h @@ -36,7 +36,6 @@ namespace ns3 { class Node; -class TraceResolver; class TraceContext; class Socket; class TcpHeader; diff --git a/src/internet-node/udp-l4-protocol.h b/src/internet-node/udp-l4-protocol.h index 77a8a3c66..5e92c1af5 100644 --- a/src/internet-node/udp-l4-protocol.h +++ b/src/internet-node/udp-l4-protocol.h @@ -33,7 +33,6 @@ namespace ns3 { class Node; -class TraceResolver; class TraceContext; class Socket; /** diff --git a/src/mobility/hierarchical-mobility-model.cc b/src/mobility/hierarchical-mobility-model.cc index a282692cd..90252a7e2 100644 --- a/src/mobility/hierarchical-mobility-model.cc +++ b/src/mobility/hierarchical-mobility-model.cc @@ -56,7 +56,7 @@ HierarchicalMobilityModel::SetChild (Ptr model) notifier = CreateObject (); m_child->AggregateObject (notifier); } - notifier->TraceConnect ("/course-changed", MakeCallback (&HierarchicalMobilityModel::ChildChanged, this)); + notifier->TraceSourceConnect ("CourseChanged", MakeCallback (&HierarchicalMobilityModel::ChildChanged, this)); } void @@ -70,7 +70,7 @@ HierarchicalMobilityModel::SetParent (Ptr model) notifier = CreateObject (); m_parent->AggregateObject (notifier); } - notifier->TraceConnect ("/course-changed", MakeCallback (&HierarchicalMobilityModel::ParentChanged, this)); + notifier->TraceSourceConnect ("CourseChanged", MakeCallback (&HierarchicalMobilityModel::ParentChanged, this)); } @@ -118,13 +118,13 @@ HierarchicalMobilityModel::DoGetVelocity (void) const } void -HierarchicalMobilityModel::ParentChanged (const TraceContext &context, Ptr model) +HierarchicalMobilityModel::ParentChanged (Ptr model) { MobilityModel::NotifyCourseChange (); } void -HierarchicalMobilityModel::ChildChanged (const TraceContext &context, Ptr model) +HierarchicalMobilityModel::ChildChanged (Ptr model) { MobilityModel::NotifyCourseChange (); } diff --git a/src/mobility/hierarchical-mobility-model.h b/src/mobility/hierarchical-mobility-model.h index 91191222e..f2d1cda70 100644 --- a/src/mobility/hierarchical-mobility-model.h +++ b/src/mobility/hierarchical-mobility-model.h @@ -60,8 +60,8 @@ private: void SetChild (Ptr model); void SetParent (Ptr model); - void ParentChanged (const TraceContext &context, Ptr model); - void ChildChanged (const TraceContext &context, Ptr model); + void ParentChanged (Ptr model); + void ChildChanged (Ptr model); Ptr m_child; Ptr m_parent; diff --git a/src/node/net-device.h b/src/node/net-device.h index cb9955d99..7df556654 100644 --- a/src/node/net-device.h +++ b/src/node/net-device.h @@ -33,7 +33,6 @@ namespace ns3 { class Node; -class TraceResolver; class TraceContext; class Channel; class Packet; diff --git a/src/node/node.cc b/src/node/node.cc index 1d62188ba..4a2268883 100644 --- a/src/node/node.cc +++ b/src/node/node.cc @@ -25,7 +25,6 @@ #include "packet-socket-factory.h" #include "ns3/packet.h" #include "ns3/simulator.h" -#include "ns3/composite-trace-resolver.h" #include "ns3/object-vector.h" #include "ns3/uinteger.h" diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index 4944f8df8..44ec1fbb5 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -1,6 +1,5 @@ #include "ns3/internet-node.h" #include "ns3/ptr.h" -#include "ns3/trace-resolver.h" #include "ns3/node-list.h" #include "ns3/point-to-point-net-device.h" #include "ns3/csma-net-device.h" @@ -12,77 +11,6 @@ using namespace ns3; -void -PrintSimpleText (const TraceResolver::SourceCollection *sources, std::ostream &os) -{ - for (TraceResolver::SourceCollection::Iterator i = sources->Begin (); i != sources->End (); i++) - { - os << "source=" << i->path << std::endl; - os << "TraceContext=["; - i->context.PrintAvailable (os, ","); - os << "]" << std::endl; - os << "help=\"" << i->doc.GetHelp () << "\"" << std::endl; - os << "void TraceSinkCallback (const TraceContext &"; - for (TraceDoc::Iterator k = i->doc.ArgsBegin (); k != i->doc.ArgsEnd (); k++) - { - os << ", " << k->first; - } - os << ")" << std::endl; - os << "argument 1 -- the trace context associated to the connected trace source." << std::endl; - uint32_t k = 2; - for (TraceDoc::Iterator j = i->doc.ArgsBegin (); j != i->doc.ArgsEnd (); j++) - { - os << "argument " << k << " -- " << j->second << "." << std::endl; - k++; - } - os << std::endl; - } -} -static void -PrintDoxygenText (const TraceResolver::SourceCollection *sources, std::ostream &os) -{ - uint32_t z = 0; - for (TraceResolver::SourceCollection::Iterator i = sources->Begin (); i != sources->End (); i++) - { - os << "///" << std::endl; - os << "/// \\ingroup TraceSourceList" << std::endl; - os << "/// \\brief " << i->doc.GetHelp () << std::endl; - os << "/// \\param arg1 the trace context associated to the connected trace source." << std::endl; - uint32_t j = 2; - for (TraceDoc::Iterator l = i->doc.ArgsBegin (); l != i->doc.ArgsEnd (); l++) - { - os << "/// \\param arg" << j << " " << l->second << "." << std::endl; - j++; - } - os << "///" << std::endl; - os << "///" << std::endl; - os << "/// The path to this trace source is: \"" << i->path << "\"." << std::endl; - os << "///" << std::endl; - if (i->context.Begin ().IsLast ()) - { - os << "/// No data can be extracted from \\p arg1 with ns3::TraceContext::GetElement." << std::endl; - } - else - { - os << "/// The following classes can be extracted from \\p arg1 with " << std::endl; - os << "/// ns3::TraceContext::GetElement:" << std::endl; - for (TraceContext::Iterator m = i->context.Begin (); !m.IsLast (); m.Next ()) - { - os << "/// - " << m.Get () << std::endl; - } - } - os << "void TraceSinkCallback" << z << " (const TraceContext & arg1" ; - j = 2; - for (TraceDoc::Iterator k = i->doc.ArgsBegin (); k != i->doc.ArgsEnd (); k++) - { - os << ", " << k->first << " arg" << j; - j++; - } - os << ");" << std::endl; - os << std::endl; - z++; - } -} static void PrintOneDefaultValue (DefaultValueBase *value, std::ostream &os) @@ -131,10 +59,6 @@ int main (int argc, char *argv[]) node->AddDevice (csma); csma->AddQueue (CreateObject ()); - TraceResolver::SourceCollection collection; - //NodeList::GetTraceResolver ()->CollectSources ("", TraceContext (), &collection); - PrintDoxygenText (&collection, std::cout); - PrintDefaultValuesDoxygen (std::cout);