From cd9040655fcb2b162f408099bac780ad6eb4e808 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 10 Mar 2018 08:43:58 -0800 Subject: [PATCH] documentation: (partial fix #2887) TracedValueCallback signatures --- src/energy/model/rv-battery-model.cc | 2 +- src/internet/model/tcp-hybla.cc | 2 +- src/internet/model/tcp-socket-base.cc | 10 +++++----- src/spectrum/model/half-duplex-ideal-phy.cc | 12 ++++++------ src/stats/examples/time-probe-example.cc | 2 +- src/wifi/model/edca-txop-n.cc | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/energy/model/rv-battery-model.cc b/src/energy/model/rv-battery-model.cc index a8205a497..6035fb62f 100644 --- a/src/energy/model/rv-battery-model.cc +++ b/src/energy/model/rv-battery-model.cc @@ -87,7 +87,7 @@ RvBatteryModel::GetTypeId (void) .AddTraceSource ("RvBatteryModelBatteryLifetime", "RV battery model battery lifetime.", MakeTraceSourceAccessor (&RvBatteryModel::m_lifetime), - "ns3::Time::TracedValueCallback") + "ns3::TracedValueCallback::Time") ; return tid; } diff --git a/src/internet/model/tcp-hybla.cc b/src/internet/model/tcp-hybla.cc index 37d87097d..2c1ea7622 100644 --- a/src/internet/model/tcp-hybla.cc +++ b/src/internet/model/tcp-hybla.cc @@ -40,7 +40,7 @@ TcpHybla::GetTypeId (void) .AddTraceSource ("Rho", "Rho parameter of Hybla", MakeTraceSourceAccessor (&TcpHybla::m_rho), - "ns3::TracedValue::DoubleCallback") + "ns3::TracedValueCallback::Double") ; return tid; } diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index fe44281b5..f7b8535a0 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -140,11 +140,11 @@ TcpSocketBase::GetTypeId (void) .AddTraceSource ("RTO", "Retransmission timeout", MakeTraceSourceAccessor (&TcpSocketBase::m_rto), - "ns3::Time::TracedValueCallback") + "ns3::TracedValueCallback::Time") .AddTraceSource ("RTT", "Last RTT sample", MakeTraceSourceAccessor (&TcpSocketBase::m_lastRtt), - "ns3::Time::TracedValueCallback") + "ns3::TracedValueCallback::Time") .AddTraceSource ("NextTxSequence", "Next sequence number to send (SND.NXT)", MakeTraceSourceAccessor (&TcpSocketBase::m_nextTxSequenceTrace), @@ -152,7 +152,7 @@ TcpSocketBase::GetTypeId (void) .AddTraceSource ("HighestSequence", "Highest sequence number ever sent in socket's life time", MakeTraceSourceAccessor (&TcpSocketBase::m_highTxMarkTrace), - "ns3::SequenceNumber32TracedValueCallback") + "ns3::TracedValueCallback::SequenceNumber32") .AddTraceSource ("State", "TCP state", MakeTraceSourceAccessor (&TcpSocketBase::m_state), @@ -176,11 +176,11 @@ TcpSocketBase::GetTypeId (void) .AddTraceSource ("HighestRxSequence", "Highest sequence number received from peer", MakeTraceSourceAccessor (&TcpSocketBase::m_highRxMark), - "ns3::SequenceNumber32TracedValueCallback") + "ns3::TracedValueCallback::SequenceNumber32") .AddTraceSource ("HighestRxAck", "Highest ack received from peer", MakeTraceSourceAccessor (&TcpSocketBase::m_highRxAckMark), - "ns3::SequenceNumber32TracedValueCallback") + "ns3::TracedValueCallback::SequenceNumber32") .AddTraceSource ("CongestionWindow", "The TCP connection's congestion window", MakeTraceSourceAccessor (&TcpSocketBase::m_cWndTrace), diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc index 17b54d966..c57410555 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.cc +++ b/src/spectrum/model/half-duplex-ideal-phy.cc @@ -114,27 +114,27 @@ HalfDuplexIdealPhy::GetTypeId (void) .AddTraceSource ("TxStart", "Trace fired when a new transmission is started", MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxStartTrace), - "ns3::Packet::TraceCallback") + "ns3::Packet::TracedCallback") .AddTraceSource ("TxEnd", "Trace fired when a previosuly started transmission is finished", MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxEndTrace), - "ns3::Packet::TraceCallback") + "ns3::Packet::TracedCallback") .AddTraceSource ("RxStart", "Trace fired when the start of a signal is detected", MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxStartTrace), - "ns3::Packet::TraceCallback") + "ns3::Packet::TracedCallback") .AddTraceSource ("RxAbort", "Trace fired when a previously started RX is aborted before time", MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxAbortTrace), - "ns3::Packet::TraceCallback") + "ns3::Packet::TracedCallback") .AddTraceSource ("RxEndOk", "Trace fired when a previosuly started RX terminates successfully", MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndOkTrace), - "ns3::Packet::TraceCallback") + "ns3::Packet::TracedCallback") .AddTraceSource ("RxEndError", "Trace fired when a previosuly started RX terminates with an error (packet is corrupted)", MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndErrorTrace), - "ns3::Packet::TraceCallback") + "ns3::Packet::TracedCallback") ; return tid; } diff --git a/src/stats/examples/time-probe-example.cc b/src/stats/examples/time-probe-example.cc index 9b79f73a3..e55eaa8fc 100644 --- a/src/stats/examples/time-probe-example.cc +++ b/src/stats/examples/time-probe-example.cc @@ -81,7 +81,7 @@ Emitter::GetTypeId (void) .AddTraceSource ("Interval", "Trace source", MakeTraceSourceAccessor (&Emitter::m_interval), - "ns3::Time::TracedValueCallback") + "ns3::TracedValueCallback::Time") ; return tid; } diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 04d33d728..13597eaaa 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -50,11 +50,11 @@ EdcaTxopN::GetTypeId (void) .AddTraceSource ("BackoffTrace", "Trace source for backoff values", MakeTraceSourceAccessor (&EdcaTxopN::m_backoffTrace), - "ns3::TracedValue::Uint32Callback") + "ns3::TracedValueCallback::Uint32") .AddTraceSource ("CwTrace", "Trace source for contention window values", MakeTraceSourceAccessor (&EdcaTxopN::m_cwTrace), - "ns3::TracedValue::Uint32Callback") + "ns3::TracedValueCallback::Uint32") .AddTraceSource ("TxopTrace", "Trace source for txop start and duration times", MakeTraceSourceAccessor (&EdcaTxopN::m_txopTrace),