diff -r bcf7cef191c1 -r 7a750f032acd src/core/model/object-base.cc --- a/src/core/model/object-base.cc Sat Nov 10 18:45:37 2012 +0100 +++ b/src/core/model/object-base.cc Sat Nov 10 19:16:38 2012 +0100 @@ -36,6 +36,7 @@ static TypeId GetObjectIid (void) { + NS_LOG_FUNCTION_NOARGS (); TypeId tid = TypeId ("ns3::ObjectBase"); tid.SetParent (tid); return tid; @@ -44,22 +45,27 @@ TypeId ObjectBase::GetTypeId (void) { + NS_LOG_FUNCTION_NOARGS (); static TypeId tid = GetObjectIid (); return tid; } ObjectBase::~ObjectBase () { + NS_LOG_FUNCTION (this); } void ObjectBase::NotifyConstructionCompleted (void) -{} +{ + NS_LOG_FUNCTION (this); +} void ObjectBase::ConstructSelf (const AttributeConstructionList &attributes) { // loop over the inheritance tree back to the Object base class. + NS_LOG_FUNCTION (this << &attributes); TypeId tid = GetInstanceTypeId (); do { // loop over all attributes in object type @@ -140,6 +146,7 @@ Ptr checker, const AttributeValue &value) { + NS_LOG_FUNCTION (this << accessor << checker << &value); Ptr v = checker->CreateValidValue (value); if (v == 0) { @@ -148,9 +155,11 @@ bool ok = accessor->Set (this, *v); return ok; } + void ObjectBase::SetAttribute (std::string name, const AttributeValue &value) { + NS_LOG_FUNCTION (this << name << &value); struct TypeId::AttributeInformation info; TypeId tid = GetInstanceTypeId (); if (!tid.LookupAttributeByName (name, &info)) @@ -170,6 +179,7 @@ bool ObjectBase::SetAttributeFailSafe (std::string name, const AttributeValue &value) { + NS_LOG_FUNCTION (this << name << &value); struct TypeId::AttributeInformation info; TypeId tid = GetInstanceTypeId (); if (!tid.LookupAttributeByName (name, &info)) @@ -187,6 +197,7 @@ void ObjectBase::GetAttribute (std::string name, AttributeValue &value) const { + NS_LOG_FUNCTION (this << name << &value); struct TypeId::AttributeInformation info; TypeId tid = GetInstanceTypeId (); if (!tid.LookupAttributeByName (name, &info)) @@ -221,6 +232,7 @@ bool ObjectBase::GetAttributeFailSafe (std::string name, AttributeValue &value) const { + NS_LOG_FUNCTION (this << name << &value); struct TypeId::AttributeInformation info; TypeId tid = GetInstanceTypeId (); if (!tid.LookupAttributeByName (name, &info)) @@ -255,6 +267,7 @@ bool ObjectBase::TraceConnectWithoutContext (std::string name, const CallbackBase &cb) { + NS_LOG_FUNCTION (this << name << &cb); TypeId tid = GetInstanceTypeId (); Ptr accessor = tid.LookupTraceSourceByName (name); if (accessor == 0) @@ -267,6 +280,7 @@ bool ObjectBase::TraceConnect (std::string name, std::string context, const CallbackBase &cb) { + NS_LOG_FUNCTION (this << name << context << &cb); TypeId tid = GetInstanceTypeId (); Ptr accessor = tid.LookupTraceSourceByName (name); if (accessor == 0) @@ -279,6 +293,7 @@ bool ObjectBase::TraceDisconnectWithoutContext (std::string name, const CallbackBase &cb) { + NS_LOG_FUNCTION (this << name << &cb); TypeId tid = GetInstanceTypeId (); Ptr accessor = tid.LookupTraceSourceByName (name); if (accessor == 0) @@ -291,6 +306,7 @@ bool ObjectBase::TraceDisconnect (std::string name, std::string context, const CallbackBase &cb) { + NS_LOG_FUNCTION (this << name << context << &cb); TypeId tid = GetInstanceTypeId (); Ptr accessor = tid.LookupTraceSourceByName (name); if (accessor == 0)