From 496f1d91d03fc30e47c86ab3ef3849fea00897b9 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 8 Aug 2007 10:06:58 +0200 Subject: [PATCH] TraceContextElement::Register -> TraceContextElement::AllocateUid --- src/common/composite-trace-resolver.cc | 4 ++-- src/common/trace-context-element.h | 10 +++++----- src/common/trace-context.cc | 2 +- src/devices/csma-cd/csma-cd-net-device.cc | 2 +- .../point-to-point/point-to-point-net-device.cc | 2 +- src/internet-node/ipv4-l3-protocol.cc | 4 ++-- src/internet-node/ipv4-l4-demux.cc | 2 +- src/node/node-list.cc | 2 +- src/node/node.cc | 2 +- src/node/queue.cc | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/common/composite-trace-resolver.cc b/src/common/composite-trace-resolver.cc index 924225342..bf60aa81e 100644 --- a/src/common/composite-trace-resolver.cc +++ b/src/common/composite-trace-resolver.cc @@ -128,7 +128,7 @@ public: SUBRESOLVER, }; static uint16_t GetUid (void) - {static uint16_t uid = Register ("TraceSourceTest"); return uid;} + {static uint16_t uid = AllocateUid ("TraceSourceTest"); return uid;} void Print (std::ostream &os) {os << "tracesource="; if (m_sources == DOUBLEA) {os << "doubleA";} @@ -150,7 +150,7 @@ public: INT, }; static uint16_t GetUid (void) - {static uint16_t uid = Register ("SubTraceSourceTest"); return uid;} + {static uint16_t uid = AllocateUid ("SubTraceSourceTest"); return uid;} void Print (std::ostream &os) {os << "subtracesource=int";} SubTraceSourceTest () : m_sources (SubTraceSourceTest::INT) {} diff --git a/src/common/trace-context-element.h b/src/common/trace-context-element.h index e9829a2f5..e27076537 100644 --- a/src/common/trace-context-element.h +++ b/src/common/trace-context-element.h @@ -20,7 +20,7 @@ class TraceContextElement { protected: template - static uint16_t Register (std::string name); + static uint16_t AllocateUid (std::string name); }; } // namespace ns3 @@ -35,7 +35,7 @@ class ElementRegistry { public: template - static uint16_t Register (std::string name); + static uint16_t AllocateUid (std::string name); static uint32_t GetSize (uint16_t uid); static void Print (uint16_t uid, uint8_t *instance, std::ostream &os); @@ -78,7 +78,7 @@ ElementRegistry::DoDestroy (uint8_t *instance) template uint16_t -ElementRegistry::Register (std::string name) +ElementRegistry::AllocateUid (std::string name) { InfoVector *vec = GetInfoVector (); uint16_t uid = 1; @@ -103,9 +103,9 @@ ElementRegistry::Register (std::string name) template uint16_t -TraceContextElement::Register (std::string name) +TraceContextElement::AllocateUid (std::string name) { - return ElementRegistry::Register (name); + return ElementRegistry::AllocateUid (name); } } // namespace ns3 diff --git a/src/common/trace-context.cc b/src/common/trace-context.cc index 916079020..50e9d0a73 100644 --- a/src/common/trace-context.cc +++ b/src/common/trace-context.cc @@ -242,7 +242,7 @@ template class Ctx : public TraceContextElement { public: - static uint16_t GetUid (void) {static uint16_t uid = Register > (GetName ()); return uid;} + static uint16_t GetUid (void) {static uint16_t uid = AllocateUid > (GetName ()); return uid;} static std::string GetName (void) {std::ostringstream oss; oss << "Ctx" << N; return oss.str ();} Ctx () : m_v (0) {} Ctx (int v) : m_v (v) {} diff --git a/src/devices/csma-cd/csma-cd-net-device.cc b/src/devices/csma-cd/csma-cd-net-device.cc index f5a526f06..d5dfc8501 100644 --- a/src/devices/csma-cd/csma-cd-net-device.cc +++ b/src/devices/csma-cd/csma-cd-net-device.cc @@ -56,7 +56,7 @@ CsmaCdTraceType::Print (std::ostream &os) const uint16_t CsmaCdTraceType::GetUid (void) { - static uint16_t uid = Register ("CsmaCdTraceType"); + static uint16_t uid = AllocateUid ("CsmaCdTraceType"); return uid; } diff --git a/src/devices/point-to-point/point-to-point-net-device.cc b/src/devices/point-to-point/point-to-point-net-device.cc index 69271bc6e..86c9d9a4c 100644 --- a/src/devices/point-to-point/point-to-point-net-device.cc +++ b/src/devices/point-to-point/point-to-point-net-device.cc @@ -50,7 +50,7 @@ PointToPointTraceType::Print (std::ostream &os) const uint16_t PointToPointTraceType::GetUid (void) { - static uint16_t uid = Register ("PointToPointTraceType"); + static uint16_t uid = AllocateUid ("PointToPointTraceType"); return uid; } diff --git a/src/internet-node/ipv4-l3-protocol.cc b/src/internet-node/ipv4-l3-protocol.cc index 1e39b5ce8..be483dfa0 100644 --- a/src/internet-node/ipv4-l3-protocol.cc +++ b/src/internet-node/ipv4-l3-protocol.cc @@ -85,7 +85,7 @@ Ipv4L3ProtocolTraceContextElement::Print (std::ostream &os) const uint16_t Ipv4L3ProtocolTraceContextElement::GetUid (void) { - static uint16_t uid = Register ("Ipv4L3ProtocolTraceContextElement"); + static uint16_t uid = AllocateUid ("Ipv4L3ProtocolTraceContextElement"); return uid; } @@ -109,7 +109,7 @@ Ipv4l3ProtocolInterfaceIndex::Print (std::ostream &os) const uint16_t Ipv4l3ProtocolInterfaceIndex::GetUid (void) { - static uint16_t uid = Register ("Ipv4l3ProtocolInterfaceIndex"); + static uint16_t uid = AllocateUid ("Ipv4l3ProtocolInterfaceIndex"); return uid; } diff --git a/src/internet-node/ipv4-l4-demux.cc b/src/internet-node/ipv4-l4-demux.cc index 78c8b0a3a..977b802ba 100644 --- a/src/internet-node/ipv4-l4-demux.cc +++ b/src/internet-node/ipv4-l4-demux.cc @@ -51,7 +51,7 @@ Ipv4L4ProtocolTraceContextElement::Print (std::ostream &os) const uint16_t Ipv4L4ProtocolTraceContextElement::GetUid (void) { - static uint16_t uid = Register ("Ipv4L4ProtocolTraceContextElement"); + static uint16_t uid = AllocateUid ("Ipv4L4ProtocolTraceContextElement"); return uid; } diff --git a/src/node/node-list.cc b/src/node/node-list.cc index db8882abd..eb43727d9 100644 --- a/src/node/node-list.cc +++ b/src/node/node-list.cc @@ -54,7 +54,7 @@ NodeListIndex::Print (std::ostream &os) uint16_t NodeListIndex::GetUid (void) { - static uint16_t uid = Register ("NodeListIndex"); + static uint16_t uid = AllocateUid ("NodeListIndex"); return uid; } uint32_t diff --git a/src/node/node.cc b/src/node/node.cc index d832cdf42..ee83e8588 100644 --- a/src/node/node.cc +++ b/src/node/node.cc @@ -50,7 +50,7 @@ NodeNetDeviceIndex::Print (std::ostream &os) const uint16_t NodeNetDeviceIndex::GetUid (void) { - static uint16_t uid = Register ("NodeNetDeviceIndex"); + static uint16_t uid = AllocateUid ("NodeNetDeviceIndex"); return uid; } diff --git a/src/node/queue.cc b/src/node/queue.cc index 377779bc3..72eafed69 100644 --- a/src/node/queue.cc +++ b/src/node/queue.cc @@ -35,7 +35,7 @@ static ClassIdDefaultValue g_classIdDefaultValue ("Queue", "Packet Queue", uint16_t QueueTraceType::GetUid (void) { - static uint16_t uid = Register ("QueueTraceType"); + static uint16_t uid = AllocateUid ("QueueTraceType"); return uid; } QueueTraceType::QueueTraceType ()