diff -r bcf7cef191c1 -r 7a750f032acd src/core/model/global-value.cc
--- a/src/core/model/global-value.cc	Sat Nov 10 18:45:37 2012 +0100
+++ b/src/core/model/global-value.cc	Sat Nov 10 19:16:38 2012 +0100
@@ -22,6 +22,7 @@
 #include "attribute.h"
 #include "string.h"
 #include "uinteger.h"
+#include "log.h"
 
 #include "ns3/core-config.h"
 #ifdef HAVE_STDLIB_H
@@ -30,6 +31,8 @@
 
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("GlobalValue");
+
 GlobalValue::GlobalValue (std::string name, std::string help,
                           const AttributeValue &initialValue,
                           Ptr<const AttributeChecker> checker)
@@ -39,6 +42,7 @@
     m_currentValue (0),
     m_checker (checker)
 {
+  NS_LOG_FUNCTION (name << help << &initialValue << checker);
   if (m_checker == 0)
     {
       NS_FATAL_ERROR ("Checker should not be zero on " << name );
@@ -56,6 +60,7 @@
 void
 GlobalValue::InitializeFromEnv (void)
 {
+  NS_LOG_FUNCTION (this);
 #ifdef HAVE_GETENV
   char *envVar = getenv ("NS_GLOBAL_VALUE");
   if (envVar == 0)
@@ -93,16 +98,19 @@
 std::string 
 GlobalValue::GetName (void) const
 {
+  NS_LOG_FUNCTION_NOARGS ();
   return m_name;
 }
 std::string 
 GlobalValue::GetHelp (void) const
 {
+  NS_LOG_FUNCTION_NOARGS ();
   return m_help;
 }
 void
 GlobalValue::GetValue (AttributeValue &value) const
 {
+  NS_LOG_FUNCTION (&value);
   bool ok = m_checker->Copy (*m_currentValue, value);
   if (ok)
     {
@@ -118,12 +126,16 @@
 Ptr<const AttributeChecker> 
 GlobalValue::GetChecker (void) const
 {
+  NS_LOG_FUNCTION (this);
+
   return m_checker;
 }
 
 bool
 GlobalValue::SetValue (const AttributeValue &value)
 {
+  NS_LOG_FUNCTION (&value);
+
   Ptr<AttributeValue> v = m_checker->CreateValidValue (value);
   if (v == 0)
     {
@@ -136,6 +148,8 @@
 void 
 GlobalValue::Bind (std::string name, const AttributeValue &value)
 {
+  NS_LOG_FUNCTION (name << &value);
+
   for (Iterator i = Begin (); i != End (); i++)
     {
       if ((*i)->GetName () == name)
@@ -152,6 +166,8 @@
 bool 
 GlobalValue::BindFailSafe (std::string name, const AttributeValue &value)
 {
+  NS_LOG_FUNCTION (name << &value);
+
   for (Iterator i = Begin (); i != End (); i++)
     {
       if ((*i)->GetName () == name)
@@ -164,23 +180,28 @@
 GlobalValue::Iterator 
 GlobalValue::Begin (void)
 {
+  NS_LOG_FUNCTION_NOARGS ();
+
   return GetVector ()->begin ();
 }
 GlobalValue::Iterator 
 GlobalValue::End (void)
 {
+  NS_LOG_FUNCTION_NOARGS ();
   return GetVector ()->end ();
 }
 
 void 
 GlobalValue::ResetInitialValue (void)
 {
+  NS_LOG_FUNCTION (this);
   m_currentValue = m_initialValue;
 }
 
 bool
 GlobalValue::GetValueByNameFailSafe (std::string name, AttributeValue &value)
 {
+  NS_LOG_FUNCTION (name << &value);
   for (GlobalValue::Iterator gvit = GlobalValue::Begin (); gvit != GlobalValue::End (); ++gvit)
     {
       if ((*gvit)->GetName () == name)
@@ -195,6 +216,7 @@
 void
 GlobalValue::GetValueByName (std::string name, AttributeValue &value)
 {
+  NS_LOG_FUNCTION (name << &value);
   if (!GetValueByNameFailSafe (name, value))
     {
       NS_FATAL_ERROR ("Could not find GlobalValue named \"" << name << "\"");
@@ -204,6 +226,7 @@
 GlobalValue::Vector *
 GlobalValue::GetVector (void)
 {
+  NS_LOG_FUNCTION_NOARGS ();
   static Vector vector;
   return &vector;
 }