# HG changeset patch
# User Peter D. Barnes, Jr. <barnes26@llnl.gov>
# Date 1412309868 25200
# Node ID 754c8256c35c98bcbf54ab0da80d4632281f4e8d
# Parent  f35701d8a0a0c647b34a02d380dc6a5f75a97c8a
TracedValue callback function signatures.

diff -r f35701d8a0a0 -r 754c8256c35c examples/tutorial/fourth.cc
--- a/examples/tutorial/fourth.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/examples/tutorial/fourth.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -33,7 +33,8 @@
       .AddConstructor<MyObject> ()
       .AddTraceSource ("MyInteger",
                        "An integer value to trace.",
-                       MakeTraceSourceAccessor (&MyObject::m_myInt))
+                       MakeTraceSourceAccessor (&MyObject::m_myInt),
+                       "ns3::TracedValue::Int32Callback")
     ;
     return tid;
   }
diff -r f35701d8a0a0 -r 754c8256c35c src/core/model/nstime.h
--- a/src/core/model/nstime.h	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/core/model/nstime.h	Thu Oct 02 21:17:48 2014 -0700
@@ -496,6 +496,15 @@
    */
   TimeWithUnit As (const enum Unit unit) const;
 
+  /**
+   * TracedValue callback signature for Time
+   *
+   * \param [in] oldValue original value of the traced variable
+   * \param [in] newValue new value of the traced variable
+   */
+  typedef void (* TracedValueCallback)(const Time oldValue,
+                                       const Time newValue);
+  
 private:
   /** How to convert between other units and the current unit. */
   struct Information
diff -r f35701d8a0a0 -r 754c8256c35c src/core/test/attribute-test-suite.cc
--- a/src/core/test/attribute-test-suite.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/core/test/attribute-test-suite.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -41,9 +41,21 @@
 {
 public:
   ValueClassTest () {}
+  
+  /**
+   * TracedValue callback signature for ValueClassTest
+   *
+   * \param [in] oldValue original value of the traced variable
+   * \param [in] newValue new value of the traced variable
+   */
+  typedef void (* TracedValueCallback)(const ValueClassTest oldValue,
+                                       const ValueClassTest newValue);
+
 private:
   int m_v;
 };
+
+
 bool operator != (const ValueClassTest &a, const ValueClassTest &b)
 {
   return true;
@@ -170,11 +182,13 @@
                      MakeValueClassTestAccessor (&AttributeObjectTest::m_valueSrc),
                      MakeValueClassTestChecker ())
       .AddTraceSource ("Source1", "help test",
-                       MakeTraceSourceAccessor (&AttributeObjectTest::m_intSrc1))
+                       MakeTraceSourceAccessor (&AttributeObjectTest::m_intSrc1),
+                       "ns3::TracedValue::Int8Callback")
       .AddTraceSource ("Source2", "help text",
                        MakeTraceSourceAccessor (&AttributeObjectTest::m_cb))
       .AddTraceSource ("ValueSource", "help text",
-                       MakeTraceSourceAccessor (&AttributeObjectTest::m_valueSrc))
+                       MakeTraceSourceAccessor (&AttributeObjectTest::m_valueSrc),
+                       "ns3::ValueClassTest::TracedValueCallback")
       .AddAttribute ("Pointer", "help text",
                      PointerValue (),
                      MakePointerAccessor (&AttributeObjectTest::m_ptr),
diff -r f35701d8a0a0 -r 754c8256c35c src/core/test/config-test-suite.cc
--- a/src/core/test/config-test-suite.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/core/test/config-test-suite.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -97,7 +97,8 @@
                    MakeIntegerAccessor (&ConfigTestObject::m_trace),
                    MakeIntegerChecker<int16_t> ())
     .AddTraceSource ("Source", "XX",
-                     MakeTraceSourceAccessor (&ConfigTestObject::m_trace))
+                     MakeTraceSourceAccessor (&ConfigTestObject::m_trace),
+                     "ns3::TracedValue::Int16Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/energy/model/basic-energy-harvester.cc
--- a/src/energy/model/basic-energy-harvester.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/energy/model/basic-energy-harvester.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -31,7 +31,7 @@
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("BasicEnergyHarvester");
-  
+
 NS_OBJECT_ENSURE_REGISTERED (BasicEnergyHarvester);
 
 TypeId
@@ -53,10 +53,12 @@
                  MakePointerChecker<RandomVariableStream> ())
   .AddTraceSource ("HarvestedPower",
                    "Harvested power by the BasicEnergyHarvester.",
-                   MakeTraceSourceAccessor (&BasicEnergyHarvester::m_harvestedPower))
+                   MakeTraceSourceAccessor (&BasicEnergyHarvester::m_harvestedPower),
+                   "ns3::TracedValue::DoubleCallback")
   .AddTraceSource ("TotalEnergyHarvested",
                    "Total energy harvested by the harvester.",
-                   MakeTraceSourceAccessor (&BasicEnergyHarvester::m_totalEnergyHarvestedJ))
+                   MakeTraceSourceAccessor (&BasicEnergyHarvester::m_totalEnergyHarvestedJ),
+                   "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/energy/model/basic-energy-source.cc
--- a/src/energy/model/basic-energy-source.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/energy/model/basic-energy-source.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -67,7 +67,8 @@
                    MakeTimeChecker ())
     .AddTraceSource ("RemainingEnergy",
                      "Remaining energy at BasicEnergySource.",
-                     MakeTraceSourceAccessor (&BasicEnergySource::m_remainingEnergyJ))
+                     MakeTraceSourceAccessor (&BasicEnergySource::m_remainingEnergyJ),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/energy/model/li-ion-energy-source.cc
--- a/src/energy/model/li-ion-energy-source.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/energy/model/li-ion-energy-source.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -104,7 +104,8 @@
                    MakeTimeChecker ())
     .AddTraceSource ("RemainingEnergy",
                      "Remaining energy at BasicEnergySource.",
-                     MakeTraceSourceAccessor (&LiIonEnergySource::m_remainingEnergyJ))
+                     MakeTraceSourceAccessor (&LiIonEnergySource::m_remainingEnergyJ),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/energy/model/rv-battery-model.cc
--- a/src/energy/model/rv-battery-model.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/energy/model/rv-battery-model.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -81,10 +81,12 @@
                    MakeIntegerChecker<int> ())
     .AddTraceSource ("RvBatteryModelBatteryLevel",
                      "RV battery model battery level.",
-                     MakeTraceSourceAccessor (&RvBatteryModel::m_batteryLevel))
+                     MakeTraceSourceAccessor (&RvBatteryModel::m_batteryLevel),
+                     "ns3::TracedValue::DoubleCallback")
     .AddTraceSource ("RvBatteryModelBatteryLifetime",
                      "RV battery model battery lifetime.",
-                     MakeTraceSourceAccessor (&RvBatteryModel::m_lifetime))
+                     MakeTraceSourceAccessor (&RvBatteryModel::m_lifetime),
+                     "ns3::Time::TracedValueCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/energy/model/simple-device-energy-model.cc
--- a/src/energy/model/simple-device-energy-model.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/energy/model/simple-device-energy-model.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -38,7 +38,8 @@
     .AddConstructor<SimpleDeviceEnergyModel> ()
     .AddTraceSource ("TotalEnergyConsumption",
                      "Total energy consumption of the radio device.",
-                     MakeTraceSourceAccessor (&SimpleDeviceEnergyModel::m_totalEnergyConsumption))
+                     MakeTraceSourceAccessor (&SimpleDeviceEnergyModel::m_totalEnergyConsumption),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/energy/model/wifi-radio-energy-model.cc
--- a/src/energy/model/wifi-radio-energy-model.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/energy/model/wifi-radio-energy-model.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -81,7 +81,8 @@
                    MakePointerChecker<WifiTxCurrentModel> ())
     .AddTraceSource ("TotalEnergyConsumption",
                      "Total energy consumption of the radio device.",
-                     MakeTraceSourceAccessor (&WifiRadioEnergyModel::m_totalEnergyConsumption))
+                     MakeTraceSourceAccessor (&WifiRadioEnergyModel::m_totalEnergyConsumption),
+                     "ns3::TracedValue::DoubleCallback")
   ; 
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/codel-queue.cc
--- a/src/internet/model/codel-queue.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/codel-queue.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -160,25 +160,32 @@
                    MakeTimeChecker ())
     .AddTraceSource ("Count",
                      "CoDel count",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_count))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_count),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("DropCount",
                      "CoDel drop count",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_dropCount))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_dropCount),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("LastCount",
                      "CoDel lastcount",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_lastCount))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_lastCount),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("DropState",
                      "Dropping state",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_dropping))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_dropping),
+                     "ns3::TracedValue::BoolCallback")
     .AddTraceSource ("BytesInQueue",
                      "Number of bytes in the queue",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_bytesInQueue))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_bytesInQueue),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("Sojourn",
                      "Time in the queue",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_sojourn))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_sojourn),
+                     "ns3::Time::TracedValueCallback")
     .AddTraceSource ("DropNext",
                      "Time until next packet drop",
-                     MakeTraceSourceAccessor (&CoDelQueue::m_dropNext))
+                     MakeTraceSourceAccessor (&CoDelQueue::m_dropNext),
+                     "ns3::TracedValue::Uint32Callback")
   ;
 
   return tid;
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/nsc-tcp-socket-impl.cc
--- a/src/internet/model/nsc-tcp-socket-impl.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/nsc-tcp-socket-impl.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -56,10 +56,16 @@
     .SetParent<TcpSocket> ()
     .AddTraceSource ("CongestionWindow",
                      "The TCP connection's congestion window",
-                     MakeTraceSourceAccessor (&NscTcpSocketImpl::m_cWnd))
+                     MakeTraceSourceAccessor (&NscTcpSocketImpl::m_cWnd),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("SlowStartThreshold",
                      "TCP slow start threshold (bytes)",
-                     MakeTraceSourceAccessor (&NscTcpSocketImpl::m_ssThresh))
+                     MakeTraceSourceAccessor (&NscTcpSocketImpl::m_ssThresh),
+                     "ns3::TracedValue::Uint32Callback")
+    .AddTraceSource ("State",
+                     "TCP state",
+                     MakeTraceSourceAccessor (&NscTcpSocketImpl::m_state),
+                     "ns3::TcpStatesTracedValueCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-newreno.cc
--- a/src/internet/model/tcp-newreno.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-newreno.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -50,10 +50,12 @@
                    MakeBooleanChecker ())
     .AddTraceSource ("CongestionWindow",
                      "The TCP connection's congestion window",
-                     MakeTraceSourceAccessor (&TcpNewReno::m_cWnd))
+                     MakeTraceSourceAccessor (&TcpNewReno::m_cWnd),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("SlowStartThreshold",
                      "TCP slow start threshold (bytes)",
-                     MakeTraceSourceAccessor (&TcpNewReno::m_ssThresh))
+                     MakeTraceSourceAccessor (&TcpNewReno::m_ssThresh),
+                     "ns3::TracedValue::Uint32Callback")
  ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-reno.cc
--- a/src/internet/model/tcp-reno.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-reno.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -46,10 +46,12 @@
                     MakeUintegerChecker<uint32_t> ())
     .AddTraceSource ("CongestionWindow",
                      "The TCP connection's congestion window",
-                     MakeTraceSourceAccessor (&TcpReno::m_cWnd))
+                     MakeTraceSourceAccessor (&TcpReno::m_cWnd),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("SlowStartThreshold",
                      "TCP slow start threshold (bytes)",
-                     MakeTraceSourceAccessor (&TcpReno::m_ssThresh))
+                     MakeTraceSourceAccessor (&TcpReno::m_ssThresh),
+                     "ns3::TracedValue::Uint32Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-rx-buffer.cc
--- a/src/internet/model/tcp-rx-buffer.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-rx-buffer.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -35,7 +35,8 @@
     .AddConstructor<TcpRxBuffer> ()
     .AddTraceSource ("NextRxSequence",
                      "Next sequence number expected (RCV.NXT)",
-                     MakeTraceSourceAccessor (&TcpRxBuffer::m_nextRxSeq))
+                     MakeTraceSourceAccessor (&TcpRxBuffer::m_nextRxSeq),
+                     "ns3::SequenceNumber32TracedValueCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-socket-base.cc
--- a/src/internet/model/tcp-socket-base.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-socket-base.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -96,22 +96,28 @@
                    MakeBooleanChecker ())
     .AddTraceSource ("RTO",
                      "Retransmission timeout",
-                     MakeTraceSourceAccessor (&TcpSocketBase::m_rto))
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_rto),
+                     "ns3::Time::TracedValueCallback")
     .AddTraceSource ("RTT",
                      "Last RTT sample",
-                     MakeTraceSourceAccessor (&TcpSocketBase::m_lastRtt))
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_lastRtt),
+                     "ns3::Time::TracedValueCallback")
     .AddTraceSource ("NextTxSequence",
                      "Next sequence number to send (SND.NXT)",
-                     MakeTraceSourceAccessor (&TcpSocketBase::m_nextTxSequence))
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_nextTxSequence),
+                     "ns3::SequenceNumber32TracedValueCallback")
     .AddTraceSource ("HighestSequence",
                      "Highest sequence number ever sent in socket's life time",
-                     MakeTraceSourceAccessor (&TcpSocketBase::m_highTxMark))
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_highTxMark),
+                     "ns3::SequenceNumber32TracedValueCallback")
     .AddTraceSource ("State",
                      "TCP state",
-                     MakeTraceSourceAccessor (&TcpSocketBase::m_state))
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_state),
+                     "ns3::TcpStatesTracedValueCallback")
     .AddTraceSource ("RWND",
                      "Remote side's flow control window",
-                     MakeTraceSourceAccessor (&TcpSocketBase::m_rWnd))
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_rWnd),
+                     "ns3::TracedValue::Uint32Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-socket.h
--- a/src/internet/model/tcp-socket.h	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-socket.h	Thu Oct 02 21:17:48 2014 -0700
@@ -36,7 +36,10 @@
 class Packet;
 
 /**
+ * \ingroup tcp
  * \brief Names of the 11 TCP states
+ *
+ * \todo This should be a member of TcpSocket.
  */
 typedef enum {
   CLOSED,       // 0
@@ -54,6 +57,16 @@
 } TcpStates_t;
 
 /**
+ * \ingroup tcp
+ * TracedValue Callback signature for TcpStates_t
+ *
+ * \param [in] oldValue original value of the traced variable
+ * \param [in] newValue new value of the traced variable
+ */
+typedef void (* TcpStatesTracedValueCallback)(const TcpStates_t oldValue,
+                                              const TcpStates_t newValue);
+
+/**
  * \ingroup socket
  *
  * \brief (abstract) base class of all TcpSockets
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-tahoe.cc
--- a/src/internet/model/tcp-tahoe.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-tahoe.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -46,10 +46,12 @@
                     MakeUintegerChecker<uint32_t> ())
     .AddTraceSource ("CongestionWindow",
                      "The TCP connection's congestion window",
-                     MakeTraceSourceAccessor (&TcpTahoe::m_cWnd))
+                     MakeTraceSourceAccessor (&TcpTahoe::m_cWnd),
+                     "ns3::TracedValue::Uint32Callback")
     .AddTraceSource ("SlowStartThreshold",
                      "TCP slow start threshold (bytes)",
-                     MakeTraceSourceAccessor (&TcpTahoe::m_ssThresh))
+                     MakeTraceSourceAccessor (&TcpTahoe::m_ssThresh),
+                     "ns3::TracedValue::Uint32Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-tx-buffer.cc
--- a/src/internet/model/tcp-tx-buffer.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-tx-buffer.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -40,7 +40,8 @@
     .AddConstructor<TcpTxBuffer> ()
     .AddTraceSource ("UnackSequence",
                      "First unacknowledged sequence number (SND.UNA)",
-                     MakeTraceSourceAccessor (&TcpTxBuffer::m_firstByteSeq))
+                     MakeTraceSourceAccessor (&TcpTxBuffer::m_firstByteSeq),
+                     "ns3::SequenceNumber32TracedValueCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/internet/model/tcp-westwood.cc
--- a/src/internet/model/tcp-westwood.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/internet/model/tcp-westwood.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -55,10 +55,12 @@
       .SetParent<TcpSocketBase>()
       .AddConstructor<TcpWestwood>()
       .AddTraceSource("CongestionWindow", "The TCP connection's congestion window",
-                      MakeTraceSourceAccessor(&TcpWestwood::m_cWnd))
+                      MakeTraceSourceAccessor(&TcpWestwood::m_cWnd),
+                      "ns3::TracedValue::Uint32Callback")
       .AddTraceSource ("SlowStartThreshold",
                        "TCP slow start threshold (bytes)",
-                       MakeTraceSourceAccessor (&TcpWestwood::m_ssThresh))
+                       MakeTraceSourceAccessor (&TcpWestwood::m_ssThresh),
+                       "ns3::TracedValue::Uint32Callback")
       .AddAttribute("FilterType", "Use this to choose no filter or Tustin's approximation filter",
                     EnumValue(TcpWestwood::TUSTIN), MakeEnumAccessor(&TcpWestwood::m_fType),
                     MakeEnumChecker(TcpWestwood::NONE, "None", TcpWestwood::TUSTIN, "Tustin"))
@@ -67,7 +69,8 @@
                     MakeEnumAccessor(&TcpWestwood::m_pType),
                     MakeEnumChecker(TcpWestwood::WESTWOOD, "Westwood",TcpWestwood::WESTWOODPLUS, "WestwoodPlus"))
       .AddTraceSource("EstimatedBW", "The estimated bandwidth",
-                    MakeTraceSourceAccessor(&TcpWestwood::m_currentBW));
+                    MakeTraceSourceAccessor(&TcpWestwood::m_currentBW),
+                      "ns3::TracedValue::DoubleCallback");
   return tid;
 }
 
diff -r f35701d8a0a0 -r 754c8256c35c src/network/test/sequence-number-test-suite.cc
--- a/src/network/test/sequence-number-test-suite.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/network/test/sequence-number-test-suite.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -44,7 +44,8 @@
       .SetParent<Object> ()
       .AddTraceSource ("TestTracedSequenceNumber",
                        "A traceable sequence number",
-                       MakeTraceSourceAccessor (&SequenceNumberTestObj::m_testTracedSequenceNumber))
+                       MakeTraceSourceAccessor (&SequenceNumberTestObj::m_testTracedSequenceNumber),
+                       "ns3::SequenceNumber32TracedValueCallback")
       .AddConstructor<SequenceNumberTestObj> ()
     ;
     return tid;
diff -r f35701d8a0a0 -r 754c8256c35c src/network/utils/sequence-number.h
--- a/src/network/utils/sequence-number.h	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/network/utils/sequence-number.h	Thu Oct 02 21:17:48 2014 -0700
@@ -471,6 +471,15 @@
 typedef SequenceNumber<uint16_t, int16_t> SequenceNumber16;
 typedef SequenceNumber<uint8_t, int8_t> SequenceNumber8;
 
+/**
+ * TracedValue callback signature for SequenceNumber32
+ *
+ * \param [in] oldValue original value of the traced variable
+ * \param [in] newValue new value of the traced variable
+ */
+typedef void (* SequenceNumber32TracedValueCallback)(const SequenceNumber32 oldValue,
+                                                     const SequenceNumber32 newValue);
+
 } // namespace ns3
 
 #endif /* NS3_SEQ_NUM_H */
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/examples/double-probe-example.cc
--- a/src/stats/examples/double-probe-example.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/examples/double-probe-example.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -60,7 +60,8 @@
     .SetParent<Object> ()
     .AddTraceSource ("Counter",
                      "sample counter",
-                     MakeTraceSourceAccessor (&Emitter::m_counter))
+                     MakeTraceSourceAccessor (&Emitter::m_counter),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/examples/file-helper-example.cc
--- a/src/stats/examples/file-helper-example.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/examples/file-helper-example.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -63,7 +63,8 @@
     .SetParent<Object> ()
     .AddTraceSource ("Counter",
                      "sample counter",
-                     MakeTraceSourceAccessor (&Emitter::m_counter))
+                     MakeTraceSourceAccessor (&Emitter::m_counter),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/examples/gnuplot-helper-example.cc
--- a/src/stats/examples/gnuplot-helper-example.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/examples/gnuplot-helper-example.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -63,7 +63,8 @@
     .SetParent<Object> ()
     .AddTraceSource ("Counter",
                      "sample counter",
-                     MakeTraceSourceAccessor (&Emitter::m_counter))
+                     MakeTraceSourceAccessor (&Emitter::m_counter),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/model/boolean-probe.cc
--- a/src/stats/model/boolean-probe.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/model/boolean-probe.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -42,7 +42,8 @@
     .AddConstructor<BooleanProbe> ()
     .AddTraceSource ( "Output",
                       "The bool that serves as output for this probe",
-                      MakeTraceSourceAccessor (&BooleanProbe::m_output))
+                      MakeTraceSourceAccessor (&BooleanProbe::m_output),
+                      "ns3::TracedValue::BoolCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/model/double-probe.cc
--- a/src/stats/model/double-probe.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/model/double-probe.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -42,7 +42,8 @@
     .AddConstructor<DoubleProbe> ()
     .AddTraceSource ( "Output",
                       "The double that serves as output for this probe",
-                      MakeTraceSourceAccessor (&DoubleProbe::m_output))
+                      MakeTraceSourceAccessor (&DoubleProbe::m_output),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/model/uinteger-16-probe.cc
--- a/src/stats/model/uinteger-16-probe.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/model/uinteger-16-probe.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -41,7 +41,8 @@
     .AddConstructor<Uinteger16Probe> ()
     .AddTraceSource ( "Output",
                       "The uint16_t that serves as output for this probe",
-                      MakeTraceSourceAccessor (&Uinteger16Probe::m_output))
+                      MakeTraceSourceAccessor (&Uinteger16Probe::m_output),
+                     "ns3::TracedValue::Uint16Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/model/uinteger-32-probe.cc
--- a/src/stats/model/uinteger-32-probe.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/model/uinteger-32-probe.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -41,7 +41,8 @@
     .AddConstructor<Uinteger32Probe> ()
     .AddTraceSource ( "Output",
                       "The uint32_t that serves as output for this probe",
-                      MakeTraceSourceAccessor (&Uinteger32Probe::m_output))
+                      MakeTraceSourceAccessor (&Uinteger32Probe::m_output),
+                     "ns3::TracedValue::Uint32Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/model/uinteger-8-probe.cc
--- a/src/stats/model/uinteger-8-probe.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/model/uinteger-8-probe.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -41,7 +41,8 @@
     .AddConstructor<Uinteger8Probe> ()
     .AddTraceSource ( "Output",
                       "The uint8_t that serves as output for this probe",
-                      MakeTraceSourceAccessor (&Uinteger8Probe::m_output))
+                      MakeTraceSourceAccessor (&Uinteger8Probe::m_output),
+                     "ns3::TracedValue::Uint8Callback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/stats/test/double-probe-test-suite.cc
--- a/src/stats/test/double-probe-test-suite.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/stats/test/double-probe-test-suite.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -55,7 +55,9 @@
 {
   static TypeId tid = TypeId ("SampleEmitter")
     .SetParent<Object> ()
-    .AddTraceSource ("Emitter", "XX", MakeTraceSourceAccessor (&SampleEmitter::m_trace))
+    .AddTraceSource ("Emitter", "XX",
+                     MakeTraceSourceAccessor (&SampleEmitter::m_trace),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }
diff -r f35701d8a0a0 -r 754c8256c35c src/uan/model/acoustic-modem-energy-model.cc
--- a/src/uan/model/acoustic-modem-energy-model.cc	Thu Oct 02 21:05:15 2014 -0700
+++ b/src/uan/model/acoustic-modem-energy-model.cc	Thu Oct 02 21:17:48 2014 -0700
@@ -65,7 +65,8 @@
                    MakeDoubleChecker<double> ())
     .AddTraceSource ("TotalEnergyConsumption",
                      "Total energy consumption of the modem device.",
-                     MakeTraceSourceAccessor (&AcousticModemEnergyModel::m_totalEnergyConsumption))
+                     MakeTraceSourceAccessor (&AcousticModemEnergyModel::m_totalEnergyConsumption),
+                     "ns3::TracedValue::DoubleCallback")
   ;
   return tid;
 }