TracedCallback function signatures, the simple ones.
These are TracedCallback function signatures for traces sources
using a single argument.
--- a/examples/stats/wifi-example-apps.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/examples/stats/wifi-example-apps.cc Fri Oct 03 02:24:42 2014 -0700
@@ -66,7 +66,8 @@
MakePointerAccessor (&Sender::m_interval),
MakePointerChecker <RandomVariableStream>())
.AddTraceSource ("Tx", "A new packet is created and is sent",
- MakeTraceSourceAccessor (&Sender::m_txTrace))
+ MakeTraceSourceAccessor (&Sender::m_txTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/applications/model/bulk-send-application.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/applications/model/bulk-send-application.cc Fri Oct 03 02:24:42 2014 -0700
@@ -64,7 +64,8 @@
MakeTypeIdAccessor (&BulkSendApplication::m_tid),
MakeTypeIdChecker ())
.AddTraceSource ("Tx", "A new packet is created and is sent",
- MakeTraceSourceAccessor (&BulkSendApplication::m_txTrace))
+ MakeTraceSourceAccessor (&BulkSendApplication::m_txTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/applications/model/onoff-application.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/applications/model/onoff-application.cc Fri Oct 03 02:24:42 2014 -0700
@@ -86,7 +86,8 @@
MakeTypeIdAccessor (&OnOffApplication::m_tid),
MakeTypeIdChecker ())
.AddTraceSource ("Tx", "A new packet is created and is sent",
- MakeTraceSourceAccessor (&OnOffApplication::m_txTrace))
+ MakeTraceSourceAccessor (&OnOffApplication::m_txTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/applications/model/udp-echo-client.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/applications/model/udp-echo-client.cc Fri Oct 03 02:24:42 2014 -0700
@@ -67,7 +67,8 @@
&UdpEchoClient::GetDataSize),
MakeUintegerChecker<uint32_t> ())
.AddTraceSource ("Tx", "A new packet is created and is sent",
- MakeTraceSourceAccessor (&UdpEchoClient::m_txTrace))
+ MakeTraceSourceAccessor (&UdpEchoClient::m_txTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/applications/model/v4ping.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/applications/model/v4ping.cc Fri Oct 03 02:24:42 2014 -0700
@@ -58,7 +58,8 @@
MakeUintegerChecker<uint32_t> (16))
.AddTraceSource ("Rtt",
"The rtt calculated by the ping.",
- MakeTraceSourceAccessor (&V4Ping::m_traceRtt));
+ MakeTraceSourceAccessor (&V4Ping::m_traceRtt),
+ "ns3::Time::TracedCallback");
;
return tid;
}
--- a/src/core/model/nstime.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/core/model/nstime.h Fri Oct 03 02:24:42 2014 -0700
@@ -27,6 +27,7 @@
#include "unused.h"
#include <stdint.h>
#include <limits>
+#include <cmath>
#include <ostream>
#include <set>
@@ -90,8 +91,6 @@
* resolution. Therefore the maximum duration of your simulation,
* if you use picoseconds, is 2^64 ps = 2^24 s = 7 months, whereas,
* had you used nanoseconds, you could have run for 584 years.
- *
- * \see attribute_Time
*/
class Time
{
@@ -914,14 +913,24 @@
return Time (ts);
}
+/**
+ * \ingroup time
+ * \class ns3::TimeValue
+ * \brief Attribute for objects of type ns3::Time
+ */
ATTRIBUTE_VALUE_DEFINE (Time);
-ATTRIBUTE_ACCESSOR_DEFINE (Time);
/**
- * \ingroup attribute_Time
+ * Attribute accessor function for Time
+ * @{
+ */
+ATTRIBUTE_ACCESSOR_DEFINE (Time);
+/**@}*/
+
+/**
+ * \ingroup time
* \brief Helper to make a Time checker with bounded range.
- *
- * The minimum and maximum values are included in the allowed range.
+ * Both limits are inclusive
*
* \param [in] min Minimum allowed value.
* \param [in] max Maximum allowed value.
@@ -929,6 +938,12 @@
*/
Ptr<const AttributeChecker> MakeTimeChecker (const Time min, const Time max);
+/**
+ * \ingroup time
+ * \brief Helper to make an unbounded Time checker.
+ *
+ * \return the AttributeChecker
+ */
inline
Ptr<const AttributeChecker> MakeTimeChecker (void)
{
@@ -936,11 +951,9 @@
}
/**
- * \ingroup attribute_Time
+ * \ingroup time
* \brief Helper to make a Time checker with a lower bound.
*
- * The minimum value is included in the allowed range.
- *
* \param [in] min Minimum allowed value.
* \return the AttributeChecker
*/
--- a/src/core/model/traced-callback.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/core/model/traced-callback.h Fri Oct 03 02:24:42 2014 -0700
@@ -88,6 +88,16 @@
void operator() (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7) const;
void operator() (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8) const;
+ /**
+ * TracedCallback signature for POD.
+ *
+ * \param [in] value Value of the traced variable.
+ * @{
+ */
+ typedef void (* Uint32Callback)(const uint32_t value);
+ /**@}*/
+
+
private:
typedef std::list<Callback<void,T1,T2,T3,T4,T5,T6,T7,T8> > CallbackList;
CallbackList m_callbackList;
--- a/src/core/model/traced-value.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/core/model/traced-value.h Fri Oct 03 02:24:42 2014 -0700
@@ -149,7 +149,7 @@
typedef void (* Int16Callback) (const int16_t oldValue, const int16_t newValue);
typedef void (* Uint16Callback)(const uint16_t oldValue, const uint16_t newValue);
typedef void (* Int32Callback) (const int32_t oldValue, const int32_t newValue);
- typedef void (* Uint32Callback)(const int32_t oldValue, const int32_t newValue);
+ typedef void (* Uint32Callback)(const uint32_t oldValue, const uint32_t newValue);
typedef void (* DoubleCallback)(const double oldValue, const double newValue);
/**@}*/
--- a/src/csma/model/csma-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/csma/model/csma-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -92,62 +92,92 @@
// to/from higher layers.
//
.AddTraceSource ("MacTx",
- "Trace source indicating a packet has arrived for transmission by this device",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxTrace))
+ "Trace source indicating a packet has "
+ "arrived for transmission by this device",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacTxDrop",
- "Trace source indicating a packet has been dropped by the device before transmission",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxDropTrace))
+ "Trace source indicating a packet has been "
+ "dropped by the device before transmission",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacPromiscRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_macPromiscRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a promiscuous trace,",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_macPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_macRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a non-promiscuous trace,",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_macRxTrace),
+ "ns3::Packet::TracedCallback")
#if 0
// Not currently implemented in this device
.AddTraceSource ("MacRxDrop",
- "Trace source indicating a packet was received, but dropped before being forwarded up the stack",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_macRxDropTrace))
+ "Trace source indicating a packet was received, "
+ "but dropped before being forwarded up the stack",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_macRxDropTrace),
+ "ns3::Packet::TracedCallback")
#endif
.AddTraceSource ("MacTxBackoff",
- "Trace source indicating a packet has been delayed by the CSMA backoff process",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxBackoffTrace))
+ "Trace source indicating a packet has been "
+ "delayed by the CSMA backoff process",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxBackoffTrace),
+ "ns3::Packet::TracedCallback")
//
// Trace souces at the "bottom" of the net device, where packets transition
// to/from the channel.
//
.AddTraceSource ("PhyTxBegin",
- "Trace source indicating a packet has begun transmitting over the channel",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_phyTxBeginTrace))
+ "Trace source indicating a packet has "
+ "begun transmitting over the channel",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_phyTxBeginTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyTxEnd",
- "Trace source indicating a packet has been completely transmitted over the channel",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_phyTxEndTrace))
+ "Trace source indicating a packet has been "
+ "completely transmitted over the channel",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_phyTxEndTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyTxDrop",
- "Trace source indicating a packet has been dropped by the device during transmission",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_phyTxDropTrace))
+ "Trace source indicating a packet has been "
+ "dropped by the device during transmission",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_phyTxDropTrace),
+ "ns3::Packet::TracedCallback")
#if 0
// Not currently implemented in this device
.AddTraceSource ("PhyRxBegin",
- "Trace source indicating a packet has begun being received by the device",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_phyRxBeginTrace))
+ "Trace source indicating a packet has "
+ "begun being received by the device",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_phyRxBeginTrace),
+ "ns3::Packet::TracedCallback")
#endif
.AddTraceSource ("PhyRxEnd",
- "Trace source indicating a packet has been completely received by the device",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_phyRxEndTrace))
+ "Trace source indicating a packet has been "
+ "completely received by the device",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_phyRxEndTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyRxDrop",
- "Trace source indicating a packet has been dropped by the device during reception",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_phyRxDropTrace))
+ "Trace source indicating a packet has been "
+ "dropped by the device during reception",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_phyRxDropTrace),
+ "ns3::Packet::TracedCallback")
//
// Trace sources designed to simulate a packet sniffer facility (tcpdump).
//
.AddTraceSource ("Sniffer",
- "Trace source simulating a non-promiscuous packet sniffer attached to the device",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_snifferTrace))
+ "Trace source simulating a non-promiscuous "
+ "packet sniffer attached to the device",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_snifferTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PromiscSniffer",
- "Trace source simulating a promiscuous packet sniffer attached to the device",
- MakeTraceSourceAccessor (&CsmaNetDevice::m_promiscSnifferTrace))
+ "Trace source simulating a promiscuous "
+ "packet sniffer attached to the device",
+ MakeTraceSourceAccessor (&CsmaNetDevice::m_promiscSnifferTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/dsr/model/dsr-option-header.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/dsr/model/dsr-option-header.h Fri Oct 03 02:24:42 2014 -0700
@@ -667,6 +667,13 @@
*/
virtual Alignment GetAlignment () const;
+ /**
+ * TracedCallback signature for DsrOptionSrHeader.
+ *
+ * \param [in] header The DsrOptionsSRHeader
+ */
+ typedef void (* TracedCallback) (const DsrOptionSRHeader & header);
+
private:
/**
* \brief The ip address header deserilize to
--- a/src/dsr/model/dsr-options.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/dsr/model/dsr-options.cc Fri Oct 03 02:24:42 2014 -0700
@@ -76,8 +76,14 @@
UintegerValue (0),
MakeUintegerAccessor (&DsrOptions::GetOptionNumber),
MakeUintegerChecker<uint8_t> ())
- .AddTraceSource ("Rx", "Receive DSR packet.",
- MakeTraceSourceAccessor (&DsrOptions::m_rxPacketTrace))
+ .AddTraceSource ("Drop",
+ "Packet dropped.",
+ MakeTraceSourceAccessor (&DsrOptions::m_dropTrace),
+ "ns3::Packet::TracedCallback")
+ .AddTraceSource ("Rx",
+ "Receive DSR packet.",
+ MakeTraceSourceAccessor (&DsrOptions::m_rxPacketTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/dsr/model/dsr-routing.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/dsr/model/dsr-routing.cc Fri Oct 03 02:24:42 2014 -0700
@@ -109,181 +109,244 @@
static TypeId tid = TypeId ("ns3::dsr::DsrRouting")
.SetParent<IpL4Protocol> ()
.AddConstructor<DsrRouting> ()
- .AddAttribute ("RouteCache", "The route cache for saving routes from route discovery process.",
+ .AddAttribute ("RouteCache",
+ "The route cache for saving routes from "
+ "route discovery process.",
PointerValue (0),
MakePointerAccessor (&DsrRouting::SetRouteCache,
&DsrRouting::GetRouteCache),
MakePointerChecker<RouteCache> ())
- .AddAttribute ("RreqTable", "The request table to manage route requests.",
+ .AddAttribute ("RreqTable",
+ "The request table to manage route requests.",
PointerValue (0),
MakePointerAccessor (&DsrRouting::SetRequestTable,
&DsrRouting::GetRequestTable),
MakePointerChecker<RreqTable> ())
- .AddAttribute ("PassiveBuffer", "The passive buffer to manage promisucously received passive ack.",
+ .AddAttribute ("PassiveBuffer",
+ "The passive buffer to manage "
+ "promisucously received passive ack.",
PointerValue (0),
MakePointerAccessor (&DsrRouting::SetPassiveBuffer,
&DsrRouting::GetPassiveBuffer),
MakePointerChecker<PassiveBuffer> ())
- .AddAttribute ("MaxSendBuffLen","Maximum number of packets that can be stored in send buffer.",
+ .AddAttribute ("MaxSendBuffLen",
+ "Maximum number of packets that can be stored "
+ "in send buffer.",
UintegerValue (64),
MakeUintegerAccessor (&DsrRouting::m_maxSendBuffLen),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("MaxSendBuffTime","Maximum time packets can be queued in the send buffer .",
+ .AddAttribute ("MaxSendBuffTime",
+ "Maximum time packets can be queued in the send buffer .",
TimeValue (Seconds (30)),
MakeTimeAccessor (&DsrRouting::m_sendBufferTimeout),
MakeTimeChecker ())
- .AddAttribute ("MaxMaintLen","Maximum number of packets that can be stored in maintenance buffer.",
+ .AddAttribute ("MaxMaintLen",
+ "Maximum number of packets that can be stored "
+ "in maintenance buffer.",
UintegerValue (50),
MakeUintegerAccessor (&DsrRouting::m_maxMaintainLen),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("MaxMaintTime","Maximum time packets can be queued in maintenance buffer.",
+ .AddAttribute ("MaxMaintTime",
+ "Maximum time packets can be queued in maintenance buffer.",
TimeValue (Seconds (30)),
MakeTimeAccessor (&DsrRouting::m_maxMaintainTime),
MakeTimeChecker ())
- .AddAttribute ("MaxCacheLen","Maximum number of route entries that can be stored in route cache.",
+ .AddAttribute ("MaxCacheLen",
+ "Maximum number of route entries that can be stored "
+ "in route cache.",
UintegerValue (64),
MakeUintegerAccessor (&DsrRouting::m_maxCacheLen),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("RouteCacheTimeout","Maximum time the route cache can be queued in route cache.",
+ .AddAttribute ("RouteCacheTimeout",
+ "Maximum time the route cache can be queued in "
+ "route cache.",
TimeValue (Seconds (300)),
MakeTimeAccessor (&DsrRouting::m_maxCacheTime),
MakeTimeChecker ())
- .AddAttribute ("MaxEntriesEachDst","Maximum number of route entries for a single destination to respond.",
+ .AddAttribute ("MaxEntriesEachDst",
+ "Maximum number of route entries for a "
+ "single destination to respond.",
UintegerValue (20),
MakeUintegerAccessor (&DsrRouting::m_maxEntriesEachDst),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("SendBuffInterval","How often to check send buffer for packet with route.",
+ .AddAttribute ("SendBuffInterval",
+ "How often to check send buffer for packet with route.",
TimeValue (Seconds (500)),
MakeTimeAccessor (&DsrRouting::m_sendBuffInterval),
MakeTimeChecker ())
- .AddAttribute ("NodeTraversalTime","The time it takes to traverse two neighboring nodes.",
+ .AddAttribute ("NodeTraversalTime",
+ "The time it takes to traverse two neighboring nodes.",
TimeValue (MilliSeconds (40)),
MakeTimeAccessor (&DsrRouting::m_nodeTraversalTime),
MakeTimeChecker ())
- .AddAttribute ("RreqRetries","Maximum number of retransmissions for request discovery of a route.",
+ .AddAttribute ("RreqRetries",
+ "Maximum number of retransmissions for "
+ "request discovery of a route.",
UintegerValue (16),
MakeUintegerAccessor (&DsrRouting::m_rreqRetries),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("MaintenanceRetries","Maximum number of retransmissions for data packets from maintenance buffer.",
+ .AddAttribute ("MaintenanceRetries",
+ "Maximum number of retransmissions for "
+ "data packets from maintenance buffer.",
UintegerValue (2),
MakeUintegerAccessor (&DsrRouting::m_maxMaintRexmt),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("RequestTableSize","Maximum number of request entries in the request table, set this as the number of nodes in the simulation.",
+ .AddAttribute ("RequestTableSize",
+ "Maximum number of request entries in the request table, "
+ "set this as the number of nodes in the simulation.",
UintegerValue (64),
MakeUintegerAccessor (&DsrRouting::m_requestTableSize),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("RequestIdSize","Maximum number of request source Ids in the request table.",
+ .AddAttribute ("RequestIdSize",
+ "Maximum number of request source Ids in "
+ "the request table.",
UintegerValue (16),
MakeUintegerAccessor (&DsrRouting::m_requestTableIds),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("UniqueRequestIdSize","Maximum number of request Ids in the request table for a single destination.",
+ .AddAttribute ("UniqueRequestIdSize",
+ "Maximum number of request Ids in "
+ "the request table for a single destination.",
UintegerValue (256),
MakeUintegerAccessor (&DsrRouting::m_maxRreqId),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("NonPropRequestTimeout","The timeout value for non-propagation request.",
+ .AddAttribute ("NonPropRequestTimeout",
+ "The timeout value for non-propagation request.",
TimeValue (MilliSeconds (30)),
MakeTimeAccessor (&DsrRouting::m_nonpropRequestTimeout),
MakeTimeChecker ())
- .AddAttribute ("DiscoveryHopLimit","The max discovery hop limit for route requests.",
+ .AddAttribute ("DiscoveryHopLimit",
+ "The max discovery hop limit for route requests.",
UintegerValue (255),
MakeUintegerAccessor (&DsrRouting::m_discoveryHopLimit),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("MaxSalvageCount","The max salvage count for a single data packet.",
+ .AddAttribute ("MaxSalvageCount",
+ "The max salvage count for a single data packet.",
UintegerValue (15),
MakeUintegerAccessor (&DsrRouting::m_maxSalvageCount),
MakeUintegerChecker<uint8_t> ())
- .AddAttribute ("BlacklistTimeout","The time for a neighbor to stay in blacklist.",
+ .AddAttribute ("BlacklistTimeout",
+ "The time for a neighbor to stay in blacklist.",
TimeValue (Seconds (3)),
MakeTimeAccessor (&DsrRouting::m_blacklistTimeout),
MakeTimeChecker ())
- .AddAttribute ("GratReplyHoldoff","The time for gratuitous reply entry to expire.",
+ .AddAttribute ("GratReplyHoldoff",
+ "The time for gratuitous reply entry to expire.",
TimeValue (Seconds (1)),
MakeTimeAccessor (&DsrRouting::m_gratReplyHoldoff),
MakeTimeChecker ())
- .AddAttribute ("BroadcastJitter","The jitter time to avoid collision for broadcast packets.",
+ .AddAttribute ("BroadcastJitter",
+ "The jitter time to avoid collision for broadcast packets.",
UintegerValue (10),
MakeUintegerAccessor (&DsrRouting::m_broadcastJitter),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("LinkAckTimeout","The time a packet in maintenance buffer wait for link acknowledgment.",
+ .AddAttribute ("LinkAckTimeout",
+ "The time a packet in maintenance buffer wait for "
+ "link acknowledgment.",
TimeValue (MilliSeconds (100)),
MakeTimeAccessor (&DsrRouting::m_linkAckTimeout),
MakeTimeChecker ())
- .AddAttribute ("TryLinkAcks","The number of link acknowledgment to use.",
+ .AddAttribute ("TryLinkAcks",
+ "The number of link acknowledgment to use.",
UintegerValue (1),
MakeUintegerAccessor (&DsrRouting::m_tryLinkAcks),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("PassiveAckTimeout","The time a packet in maintenance buffer wait for passive acknowledgment.",
+ .AddAttribute ("PassiveAckTimeout",
+ "The time a packet in maintenance buffer wait for "
+ "passive acknowledgment.",
TimeValue (MilliSeconds (100)),
MakeTimeAccessor (&DsrRouting::m_passiveAckTimeout),
MakeTimeChecker ())
- .AddAttribute ("TryPassiveAcks","The number of passive acknowledgment to use.",
+ .AddAttribute ("TryPassiveAcks",
+ "The number of passive acknowledgment to use.",
UintegerValue (1),
MakeUintegerAccessor (&DsrRouting::m_tryPassiveAcks),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("RequestPeriod","The base time interval between route requests.",
+ .AddAttribute ("RequestPeriod",
+ "The base time interval between route requests.",
TimeValue (MilliSeconds (500)),
MakeTimeAccessor (&DsrRouting::m_requestPeriod),
MakeTimeChecker ())
- .AddAttribute ("MaxRequestPeriod","The max time interval between route requests.",
+ .AddAttribute ("MaxRequestPeriod",
+ "The max time interval between route requests.",
TimeValue (Seconds (10)),
MakeTimeAccessor (&DsrRouting::m_maxRequestPeriod),
MakeTimeChecker ())
- .AddAttribute ("GraReplyTableSize","The gratuitous reply table size.",
+ .AddAttribute ("GraReplyTableSize",
+ "The gratuitous reply table size.",
UintegerValue (64),
MakeUintegerAccessor (&DsrRouting::m_graReplyTableSize),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("CacheType","Use Link Cache or use Path Cache",
+ .AddAttribute ("CacheType",
+ "Use Link Cache or use Path Cache",
StringValue ("LinkCache"),
MakeStringAccessor (&DsrRouting::m_cacheType),
MakeStringChecker ())
- .AddAttribute ("StabilityDecrFactor","The stability decrease factor for link cache",
+ .AddAttribute ("StabilityDecrFactor",
+ "The stability decrease factor for link cache",
UintegerValue (2),
MakeUintegerAccessor (&DsrRouting::m_stabilityDecrFactor),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("StabilityIncrFactor","The stability increase factor for link cache",
+ .AddAttribute ("StabilityIncrFactor",
+ "The stability increase factor for link cache",
UintegerValue (4),
MakeUintegerAccessor (&DsrRouting::m_stabilityIncrFactor),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("InitStability","The initial stability factor for link cache",
+ .AddAttribute ("InitStability",
+ "The initial stability factor for link cache",
TimeValue (Seconds (25)),
MakeTimeAccessor (&DsrRouting::m_initStability),
MakeTimeChecker ())
- .AddAttribute ("MinLifeTime","The minimal life time for link cache",
+ .AddAttribute ("MinLifeTime",
+ "The minimal life time for link cache",
TimeValue (Seconds (1)),
MakeTimeAccessor (&DsrRouting::m_minLifeTime),
MakeTimeChecker ())
- .AddAttribute ("UseExtends","The extension time for link cache",
+ .AddAttribute ("UseExtends",
+ "The extension time for link cache",
TimeValue (Seconds (120)),
MakeTimeAccessor (&DsrRouting::m_useExtends),
MakeTimeChecker ())
- .AddAttribute ("EnableSubRoute","Enables saving of sub route when receiving route error messages, only available when using path route cache",
+ .AddAttribute ("EnableSubRoute",
+ "Enables saving of sub route when receiving "
+ "route error messages, only available when "
+ "using path route cache",
BooleanValue (true),
MakeBooleanAccessor (&DsrRouting::m_subRoute),
MakeBooleanChecker ())
- .AddAttribute ("RetransIncr","The increase time for retransmission timer when facing network congestion",
+ .AddAttribute ("RetransIncr",
+ "The increase time for retransmission timer "
+ "when facing network congestion",
TimeValue (MilliSeconds (20)),
MakeTimeAccessor (&DsrRouting::m_retransIncr),
MakeTimeChecker ())
- .AddAttribute ("MaxNetworkQueueSize","The max number of packet to save in the network queue.",
+ .AddAttribute ("MaxNetworkQueueSize",
+ "The max number of packet to save in the network queue.",
UintegerValue (400),
MakeUintegerAccessor (&DsrRouting::m_maxNetworkSize),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("MaxNetworkQueueDelay","The max time for a packet to stay in the network queue.",
+ .AddAttribute ("MaxNetworkQueueDelay",
+ "The max time for a packet to stay in the network queue.",
TimeValue (Seconds (30.0)),
MakeTimeAccessor (&DsrRouting::m_maxNetworkDelay),
MakeTimeChecker ())
- .AddAttribute ("NumPriorityQueues","The max number of packet to save in the network queue.",
+ .AddAttribute ("NumPriorityQueues",
+ "The max number of packet to save in the network queue.",
UintegerValue (2),
MakeUintegerAccessor (&DsrRouting::m_numPriorityQueues),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("LinkAcknowledgment","Enable Link layer acknowledgment mechanism",
+ .AddAttribute ("LinkAcknowledgment",
+ "Enable Link layer acknowledgment mechanism",
BooleanValue (true),
MakeBooleanAccessor (&DsrRouting::m_linkAck),
MakeBooleanChecker ())
- .AddTraceSource ("Tx", "Send DSR packet.",
- MakeTraceSourceAccessor (&DsrRouting::m_txPacketTrace))
- .AddTraceSource ("Drop", "Drop DSR packet",
- MakeTraceSourceAccessor (&DsrRouting::m_dropTrace))
+ .AddTraceSource ("Tx",
+ "Send DSR packet.",
+ MakeTraceSourceAccessor (&DsrRouting::m_txPacketTrace),
+ "ns3::DsrOptionSRHeader::TracedCallback")
+ .AddTraceSource ("Drop",
+ "Drop DSR packet",
+ MakeTraceSourceAccessor (&DsrRouting::m_dropTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/fd-net-device/model/fd-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/fd-net-device/model/fd-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -88,12 +88,14 @@
MakeMac48AddressAccessor (&FdNetDevice::m_address),
MakeMac48AddressChecker ())
.AddAttribute ("Start",
- "The simulation time at which to spin up the device thread.",
+ "The simulation time at which to spin up "
+ "the device thread.",
TimeValue (Seconds (0.)),
MakeTimeAccessor (&FdNetDevice::m_tStart),
MakeTimeChecker ())
.AddAttribute ("Stop",
- "The simulation time at which to tear down the device thread.",
+ "The simulation time at which to tear down "
+ "the device thread.",
TimeValue (Seconds (0.)),
MakeTimeAccessor (&FdNetDevice::m_tStop),
MakeTimeChecker ())
@@ -120,29 +122,43 @@
// destined for the underlying operating system or vice-versa.
//
.AddTraceSource ("MacTx",
- "Trace source indicating a packet has arrived for transmission by this device",
- MakeTraceSourceAccessor (&FdNetDevice::m_macTxTrace))
+ "Trace source indicating a packet has "
+ "arrived for transmission by this device",
+ MakeTraceSourceAccessor (&FdNetDevice::m_macTxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacTxDrop",
- "Trace source indicating a packet has been dropped by the device before transmission",
- MakeTraceSourceAccessor (&FdNetDevice::m_macTxDropTrace))
+ "Trace source indicating a packet has "
+ "been dropped by the device before transmission",
+ MakeTraceSourceAccessor (&FdNetDevice::m_macTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacPromiscRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&FdNetDevice::m_macPromiscRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a promiscuous trace,",
+ MakeTraceSourceAccessor (&FdNetDevice::m_macPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&FdNetDevice::m_macRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a non-promiscuous trace,",
+ MakeTraceSourceAccessor (&FdNetDevice::m_macRxTrace),
+ "ns3::Packet::TracedCallback")
//
// Trace sources designed to simulate a packet sniffer facility (tcpdump).
//
.AddTraceSource ("Sniffer",
- "Trace source simulating a non-promiscuous packet sniffer attached to the device",
- MakeTraceSourceAccessor (&FdNetDevice::m_snifferTrace))
+ "Trace source simulating a non-promiscuous "
+ "packet sniffer attached to the device",
+ MakeTraceSourceAccessor (&FdNetDevice::m_snifferTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PromiscSniffer",
- "Trace source simulating a promiscuous packet sniffer attached to the device",
- MakeTraceSourceAccessor (&FdNetDevice::m_promiscSnifferTrace))
+ "Trace source simulating a promiscuous "
+ "packet sniffer attached to the device",
+ MakeTraceSourceAccessor (&FdNetDevice::m_promiscSnifferTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/internet/model/arp-cache.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/internet/model/arp-cache.cc Fri Oct 03 02:24:42 2014 -0700
@@ -42,22 +42,29 @@
static TypeId tid = TypeId ("ns3::ArpCache")
.SetParent<Object> ()
.AddAttribute ("AliveTimeout",
- "When this timeout expires, the matching cache entry needs refreshing",
+ "When this timeout expires, "
+ "the matching cache entry needs refreshing",
TimeValue (Seconds (120)),
MakeTimeAccessor (&ArpCache::m_aliveTimeout),
MakeTimeChecker ())
.AddAttribute ("DeadTimeout",
- "When this timeout expires, a new attempt to resolve the matching entry is made",
+ "When this timeout expires, "
+ "a new attempt to resolve the matching entry is made",
TimeValue (Seconds (100)),
MakeTimeAccessor (&ArpCache::m_deadTimeout),
MakeTimeChecker ())
.AddAttribute ("WaitReplyTimeout",
- "When this timeout expires, the cache entries will be scanned and entries in WaitReply state will resend ArpRequest unless MaxRetries has been exceeded, in which case the entry is marked dead",
+ "When this timeout expires, "
+ "the cache entries will be scanned and "
+ "entries in WaitReply state will resend ArpRequest "
+ "unless MaxRetries has been exceeded, "
+ "in which case the entry is marked dead",
TimeValue (Seconds (1)),
MakeTimeAccessor (&ArpCache::m_waitReplyTimeout),
MakeTimeChecker ())
.AddAttribute ("MaxRetries",
- "Number of retransmissions of ArpRequest before marking dead",
+ "Number of retransmissions of ArpRequest "
+ "before marking dead",
UintegerValue (3),
MakeUintegerAccessor (&ArpCache::m_maxRetries),
MakeUintegerChecker<uint32_t> ())
@@ -67,8 +74,10 @@
MakeUintegerAccessor (&ArpCache::m_pendingQueueSize),
MakeUintegerChecker<uint32_t> ())
.AddTraceSource ("Drop",
- "Packet dropped due to ArpCache entry in WaitReply expiring.",
- MakeTraceSourceAccessor (&ArpCache::m_dropTrace))
+ "Packet dropped due to ArpCache entry "
+ "in WaitReply expiring.",
+ MakeTraceSourceAccessor (&ArpCache::m_dropTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/internet/model/arp-l3-protocol.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/internet/model/arp-l3-protocol.cc Fri Oct 03 02:24:42 2014 -0700
@@ -51,13 +51,20 @@
ObjectVectorValue (),
MakeObjectVectorAccessor (&ArpL3Protocol::m_cacheList),
MakeObjectVectorChecker<ArpCache> ())
- .AddAttribute ("RequestJitter", "The jitter in ms a node is allowed to wait before sending an ARP request. Some jitter aims to prevent collisions. By default, the model will wait for a duration in ms defined by a uniform random-variable between 0 and RequestJitter",
+ .AddAttribute ("RequestJitter",
+ "The jitter in ms a node is allowed to wait "
+ "before sending an ARP request. Some jitter aims "
+ "to prevent collisions. By default, the model "
+ "will wait for a duration in ms defined by "
+ "a uniform random-variable between 0 and RequestJitter",
StringValue ("ns3::UniformRandomVariable[Min=0.0|Max=10.0]"),
MakePointerAccessor (&ArpL3Protocol::m_requestJitter),
MakePointerChecker<RandomVariableStream> ())
.AddTraceSource ("Drop",
- "Packet dropped because not enough room in pending queue for a specific cache entry.",
- MakeTraceSourceAccessor (&ArpL3Protocol::m_dropTrace))
+ "Packet dropped because not enough room "
+ "in pending queue for a specific cache entry.",
+ MakeTraceSourceAccessor (&ArpL3Protocol::m_dropTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
@@ -190,7 +197,7 @@
/**
* \internal
* Note: we do not update the ARP cache when we receive an ARP request
- * from an unknown node. See \bugid{107}
+ * from an unknown node. See \bugid{107}
*/
bool found = false;
for (uint32_t i = 0; i < cache->GetInterface ()->GetNAddresses (); i++)
--- a/src/internet/model/udp-socket-impl.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/internet/model/udp-socket-impl.cc Fri Oct 03 02:24:42 2014 -0700
@@ -219,8 +219,6 @@
}
if (done)
{
- m_shutdownRecv = false;
- m_shutdownSend = false;
return 0;
}
return -1;
--- a/src/lte/model/lte-common.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/lte/model/lte-common.h Fri Oct 03 02:24:42 2014 -0700
@@ -127,6 +127,14 @@
uint16_t m_size; ///< Size of transport block
uint8_t m_rv; ///< the redundancy version (HARQ)
uint8_t m_ndi; ///< new data indicator flag
+
+ /**
+ * TracedCallback signature.
+ *
+ * \param [in] params Value of the PhyTransmissionionStatParameters.
+ */
+ typedef void (* TracedCallback)(const PhyTransmissionStatParameters params);
+
};
@@ -143,6 +151,14 @@
uint8_t m_rv; ///< the redundancy version (HARQ)
uint8_t m_ndi; ///< new data indicator flag
uint8_t m_correctness; ///< correctness of the TB received
+
+ /**
+ * TracedCallback signature.
+ *
+ * \param [in] params Value of the PhyReceptionStatParameters.
+ */
+ typedef void (* TracedCallback)(const PhyReceptionStatParameters params);
+
};
--- a/src/lte/model/lte-spectrum-phy.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/lte/model/lte-spectrum-phy.cc Fri Oct 03 02:24:42 2014 -0700
@@ -189,19 +189,24 @@
.SetParent<SpectrumPhy> ()
.AddTraceSource ("TxStart",
"Trace fired when a new transmission is started",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxStartTrace))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxStartTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("TxEnd",
"Trace fired when a previosuly started transmission is finished",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxEndTrace))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxEndTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("RxStart",
"Trace fired when the start of a signal is detected",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxStartTrace))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxStartTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("RxEndOk",
"Trace fired when a previosuly started RX terminates successfully",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndOkTrace))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndOkTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("RxEndError",
"Trace fired when a previosuly started RX terminates with an error",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndErrorTrace))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndErrorTrace),
+ "ns3::Packet::TracedCallback")
.AddAttribute ("DataErrorModelEnabled",
"Activate/Deactivate the error model of data (TBs of PDSCH and PUSCH) [by default is active].",
BooleanValue (true),
@@ -214,10 +219,12 @@
MakeBooleanChecker ())
.AddTraceSource ("DlPhyReception",
"DL reception PHY layer statistics.",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_dlPhyReception))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_dlPhyReception),
+ "ns3::PhyReceptionStatParameters::TracedCallback")
.AddTraceSource ("UlPhyReception",
"DL reception PHY layer statistics.",
- MakeTraceSourceAccessor (&LteSpectrumPhy::m_ulPhyReception))
+ MakeTraceSourceAccessor (&LteSpectrumPhy::m_ulPhyReception),
+ "ns3::PhyReceptionStatParameters::TracedCallback")
;
return tid;
}
--- a/src/mesh/model/dot11s/hwmp-protocol.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc Fri Oct 03 02:24:42 2014 -0700
@@ -164,7 +164,8 @@
.AddTraceSource ( "RouteDiscoveryTime",
"The time of route discovery procedure",
MakeTraceSourceAccessor (
- &HwmpProtocol::m_routeDiscoveryTimeCallback)
+ &HwmpProtocol::m_routeDiscoveryTimeCallback),
+ "ns3::Time::TracedCallback"
)
;
return tid;
--- a/src/network/model/packet.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/network/model/packet.h Fri Oct 03 02:24:42 2014 -0700
@@ -652,6 +652,13 @@
*/
Ptr<NixVector> GetNixVector (void) const;
+ /**
+ * TracedCallback signature for Ptr<Packet>
+ *
+ * \param [in] packet The packet.
+ */
+ typedef void (* TracedCallback) (const Ptr<const Packet> packet);
+
private:
/**
* \brief Constructor
--- a/src/network/utils/mac48-address.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/network/utils/mac48-address.h Fri Oct 03 02:24:42 2014 -0700
@@ -128,6 +128,14 @@
* \returns a multicast address.
*/
static Mac48Address GetMulticast6Prefix (void);
+
+ /**
+ * TracedCallback signature for Mac48Address
+ *
+ * \param [in] value Current value of the Mac48Address
+ */
+ typedef void (* TracedCallback)(const Mac48Address value);
+
private:
/**
* \returns a new Address instance
--- a/src/network/utils/packet-burst.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/network/utils/packet-burst.h Fri Oct 03 02:24:42 2014 -0700
@@ -74,6 +74,15 @@
* \return iterator to the burst list end
*/
std::list<Ptr<Packet> >::const_iterator End (void) const;
+
+ /**
+ * TracedCallback signature for Ptr<PacketBurst>
+ *
+ * \param [in] burst The PacketBurst
+ */
+ typedef void (* TracedCallback)(const Ptr<const PacketBurst> burst);
+
+
private:
void DoDispose (void);
std::list<Ptr<Packet> > m_packets; //!< the list of packets in the burst
--- a/src/network/utils/packet-socket.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/network/utils/packet-socket.cc Fri Oct 03 02:24:42 2014 -0700
@@ -42,7 +42,8 @@
.SetParent<Socket> ()
.AddConstructor<PacketSocket> ()
.AddTraceSource ("Drop", "Drop packet due to receive buffer overflow",
- MakeTraceSourceAccessor (&PacketSocket::m_dropTrace))
+ MakeTraceSourceAccessor (&PacketSocket::m_dropTrace),
+ "ns3::Packet::TracedCallback")
.AddAttribute ("RcvBufSize",
"PacketSocket maximum receive buffer size (bytes)",
UintegerValue (131072),
--- a/src/network/utils/queue.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/network/utils/queue.cc Fri Oct 03 02:24:42 2014 -0700
@@ -32,11 +32,14 @@
static TypeId tid = TypeId ("ns3::Queue")
.SetParent<Object> ()
.AddTraceSource ("Enqueue", "Enqueue a packet in the queue.",
- MakeTraceSourceAccessor (&Queue::m_traceEnqueue))
+ MakeTraceSourceAccessor (&Queue::m_traceEnqueue),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("Dequeue", "Dequeue a packet from the queue.",
- MakeTraceSourceAccessor (&Queue::m_traceDequeue))
+ MakeTraceSourceAccessor (&Queue::m_traceDequeue),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("Drop", "Drop a packet stored in the queue.",
- MakeTraceSourceAccessor (&Queue::m_traceDrop))
+ MakeTraceSourceAccessor (&Queue::m_traceDrop),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/network/utils/simple-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/network/utils/simple-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -209,8 +209,10 @@
MakeDataRateAccessor (&SimpleNetDevice::m_bps),
MakeDataRateChecker ())
.AddTraceSource ("PhyRxDrop",
- "Trace source indicating a packet has been dropped by the device during reception",
- MakeTraceSourceAccessor (&SimpleNetDevice::m_phyRxDropTrace))
+ "Trace source indicating a packet has been dropped "
+ "by the device during reception",
+ MakeTraceSourceAccessor (&SimpleNetDevice::m_phyRxDropTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/spectrum/model/aloha-noack-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/spectrum/model/aloha-noack-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -82,19 +82,29 @@
&AlohaNoackNetDevice::SetPhy),
MakePointerChecker<Object> ())
.AddTraceSource ("MacTx",
- "Trace source indicating a packet has arrived for transmission by this device",
- MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macTxTrace))
+ "Trace source indicating a packet has arrived "
+ "for transmission by this device",
+ MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macTxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacTxDrop",
- "Trace source indicating a packet has been dropped by the device before transmission",
- MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macTxDropTrace))
+ "Trace source indicating a packet has been dropped "
+ "by the device before transmission",
+ MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacPromiscRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macPromiscRxTrace))
+ "A packet has been received by this device, has been "
+ "passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a promiscuous trace,",
+ MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a non-promiscuous trace,",
+ MakeTraceSourceAccessor (&AlohaNoackNetDevice::m_macRxTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/spectrum/model/half-duplex-ideal-phy.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc Fri Oct 03 02:24:42 2014 -0700
@@ -106,22 +106,28 @@
MakeDataRateChecker ())
.AddTraceSource ("TxStart",
"Trace fired when a new transmission is started",
- MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxStartTrace))
+ MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxStartTrace),
+ "ns3::Packet::TraceCallback")
.AddTraceSource ("TxEnd",
"Trace fired when a previosuly started transmission is finished",
- MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxEndTrace))
+ MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxEndTrace),
+ "ns3::Packet::TraceCallback")
.AddTraceSource ("RxStart",
"Trace fired when the start of a signal is detected",
- MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxStartTrace))
+ MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxStartTrace),
+ "ns3::Packet::TraceCallback")
.AddTraceSource ("RxAbort",
"Trace fired when a previously started RX is aborted before time",
- MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxAbortTrace))
+ MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxAbortTrace),
+ "ns3::Packet::TraceCallback")
.AddTraceSource ("RxEndOk",
"Trace fired when a previosuly started RX terminates successfully",
- MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndOkTrace))
+ MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndOkTrace),
+ "ns3::Packet::TraceCallback")
.AddTraceSource ("RxEndError",
"Trace fired when a previosuly started RX terminates with an error (packet is corrupted)",
- MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndErrorTrace))
+ MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndErrorTrace),
+ "ns3::Packet::TraceCallback")
;
return tid;
}
--- a/src/spectrum/model/spectrum-analyzer.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/spectrum/model/spectrum-analyzer.cc Fri Oct 03 02:24:42 2014 -0700
@@ -73,19 +73,24 @@
.SetParent<SpectrumPhy> ()
.AddConstructor<SpectrumAnalyzer> ()
.AddAttribute ("Resolution",
- "the lengh of the time interval over which the power spectral "
- "density of incoming signals is averaged",
+ "The lengh of the time interval over which the "
+ "power spectral density of incoming signals is averaged",
TimeValue (MilliSeconds (1)),
MakeTimeAccessor (&SpectrumAnalyzer::m_resolution),
MakeTimeChecker ())
.AddAttribute ("NoisePowerSpectralDensity",
- "the power spectral density of the measuring instrument noise, in Watt/Hz. Mostly useful to make spectrograms look more similar to those obtained by real devices. Defaults to the value for thermal noise at 300K.",
+ "The power spectral density of the measuring instrument "
+ "noise, in Watt/Hz. Mostly useful to make spectrograms "
+ "look more similar to those obtained by real devices. "
+ "Defaults to the value for thermal noise at 300K.",
DoubleValue (1.38e-23 * 300),
MakeDoubleAccessor (&SpectrumAnalyzer::m_noisePowerSpectralDensity),
MakeDoubleChecker<double> ())
.AddTraceSource ("AveragePowerSpectralDensityReport",
- "Trace fired whenever a new value for the average Power Spectral Density is calculated",
- MakeTraceSourceAccessor (&SpectrumAnalyzer::m_averagePowerSpectralDensityReportTrace))
+ "Trace fired whenever a new value for the average "
+ "Power Spectral Density is calculated",
+ MakeTraceSourceAccessor (&SpectrumAnalyzer::m_averagePowerSpectralDensityReportTrace),
+ "ns3::SpectrumValue::TracedCallback")
;
return tid;
}
--- a/src/spectrum/model/spectrum-value.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/spectrum/model/spectrum-value.h Fri Oct 03 02:24:42 2014 -0700
@@ -503,6 +503,12 @@
*/
Ptr<SpectrumValue> Copy () const;
+ /**
+ * TracedCallback signature for SpectrumValue.
+ *
+ * \param [in] value Value of the traced variable.
+ */
+ typedef void (* TracedCallback)(const Ptr<const SpectrumValue> value);
private:
--- a/src/spectrum/model/waveform-generator.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/spectrum/model/waveform-generator.cc Fri Oct 03 02:24:42 2014 -0700
@@ -81,10 +81,12 @@
MakeDoubleChecker<double> ())
.AddTraceSource ("TxStart",
"Trace fired when a new transmission is started",
- MakeTraceSourceAccessor (&WaveformGenerator::m_phyTxStartTrace))
+ MakeTraceSourceAccessor (&WaveformGenerator::m_phyTxStartTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("TxEnd",
"Trace fired when a previosuly started transmission is finished",
- MakeTraceSourceAccessor (&WaveformGenerator::m_phyTxEndTrace))
+ MakeTraceSourceAccessor (&WaveformGenerator::m_phyTxEndTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/uan/model/uan-phy.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/uan/model/uan-phy.cc Fri Oct 03 02:24:42 2014 -0700
@@ -71,23 +71,35 @@
static TypeId tid = TypeId ("ns3::UanPhy")
.SetParent<Object> ()
.AddTraceSource ("PhyTxBegin",
- "Trace source indicating a packet has begun transmitting over the channel medium.",
- MakeTraceSourceAccessor (&UanPhy::m_phyTxBeginTrace))
+ "Trace source indicating a packet has "
+ "begun transmitting over the channel medium.",
+ MakeTraceSourceAccessor (&UanPhy::m_phyTxBeginTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyTxEnd",
- "Trace source indicating a packet has been completely transmitted over the channel.",
- MakeTraceSourceAccessor (&UanPhy::m_phyTxEndTrace))
+ "Trace source indicating a packet has "
+ "been completely transmitted over the channel.",
+ MakeTraceSourceAccessor (&UanPhy::m_phyTxEndTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyTxDrop",
- "Trace source indicating a packet has been dropped by the device during transmission.",
- MakeTraceSourceAccessor (&UanPhy::m_phyTxDropTrace))
+ "Trace source indicating a packet has "
+ "been dropped by the device during transmission.",
+ MakeTraceSourceAccessor (&UanPhy::m_phyTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyRxBegin",
- "Trace source indicating a packet has begun being received from the channel medium by the device.",
- MakeTraceSourceAccessor (&UanPhy::m_phyRxBeginTrace))
+ "Trace source indicating a packet has "
+ "begun being received from the channel medium by the device.",
+ MakeTraceSourceAccessor (&UanPhy::m_phyRxBeginTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyRxEnd",
- "Trace source indicating a packet has been completely received from the channel medium by the device.",
- MakeTraceSourceAccessor (&UanPhy::m_phyRxEndTrace))
+ "Trace source indicating a packet has "
+ "been completely received from the channel medium by the device.",
+ MakeTraceSourceAccessor (&UanPhy::m_phyRxEndTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PhyRxDrop",
- "Trace source indicating a packet has been dropped by the device during reception.",
- MakeTraceSourceAccessor (&UanPhy::m_phyRxDropTrace))
+ "Trace source indicating a packet has "
+ "been dropped by the device during reception.",
+ MakeTraceSourceAccessor (&UanPhy::m_phyRxDropTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/virtual-net-device/model/virtual-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/virtual-net-device/model/virtual-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -48,25 +48,37 @@
&VirtualNetDevice::GetMtu),
MakeUintegerChecker<uint16_t> ())
.AddTraceSource ("MacTx",
- "Trace source indicating a packet has arrived for transmission by this device",
- MakeTraceSourceAccessor (&VirtualNetDevice::m_macTxTrace))
+ "Trace source indicating a packet has arrived "
+ "for transmission by this device",
+ MakeTraceSourceAccessor (&VirtualNetDevice::m_macTxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacPromiscRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&VirtualNetDevice::m_macPromiscRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a promiscuous trace,",
+ MakeTraceSourceAccessor (&VirtualNetDevice::m_macPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&VirtualNetDevice::m_macRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a non-promiscuous trace,",
+ MakeTraceSourceAccessor (&VirtualNetDevice::m_macRxTrace),
+ "ns3::Packet::TracedCallback")
//
// Trace sources designed to simulate a packet sniffer facility (tcpdump).
//
.AddTraceSource ("Sniffer",
- "Trace source simulating a non-promiscuous packet sniffer attached to the device",
- MakeTraceSourceAccessor (&VirtualNetDevice::m_snifferTrace))
+ "Trace source simulating a non-promiscuous "
+ "packet sniffer attached to the device",
+ MakeTraceSourceAccessor (&VirtualNetDevice::m_snifferTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("PromiscSniffer",
- "Trace source simulating a promiscuous packet sniffer attached to the device",
- MakeTraceSourceAccessor (&VirtualNetDevice::m_promiscSnifferTrace))
+ "Trace source simulating a promiscuous "
+ "packet sniffer attached to the device",
+ MakeTraceSourceAccessor (&VirtualNetDevice::m_promiscSnifferTrace),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/wifi/model/regular-wifi-mac.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wifi/model/regular-wifi-mac.cc Fri Oct 03 02:24:42 2014 -0700
@@ -685,10 +685,12 @@
MakePointerChecker<EdcaTxopN> ())
.AddTraceSource ( "TxOkHeader",
"The header of successfully transmitted packet",
- MakeTraceSourceAccessor (&RegularWifiMac::m_txOkCallback))
+ MakeTraceSourceAccessor (&RegularWifiMac::m_txOkCallback),
+ "ns3::WifiMacHeader::TracedCallback")
.AddTraceSource ("TxErrHeader",
"The header of unsuccessfully transmitted packet",
- MakeTraceSourceAccessor (&RegularWifiMac::m_txErrCallback))
+ MakeTraceSourceAccessor (&RegularWifiMac::m_txErrCallback),
+ "ns3::WifiMacHeader::TracedCallback")
;
return tid;
--- a/src/wifi/model/sta-wifi-mac.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wifi/model/sta-wifi-mac.cc Fri Oct 03 02:24:42 2014 -0700
@@ -86,9 +86,11 @@
MakeBooleanAccessor (&StaWifiMac::SetActiveProbing, &StaWifiMac::GetActiveProbing),
MakeBooleanChecker ())
.AddTraceSource ("Assoc", "Associated with an access point.",
- MakeTraceSourceAccessor (&StaWifiMac::m_assocLogger))
+ MakeTraceSourceAccessor (&StaWifiMac::m_assocLogger),
+ "ns3::Mac48Address::TracedCallback")
.AddTraceSource ("DeAssoc", "Association with an access point lost.",
- MakeTraceSourceAccessor (&StaWifiMac::m_deAssocLogger))
+ MakeTraceSourceAccessor (&StaWifiMac::m_deAssocLogger),
+ "ns3::Mac48Address::TracedCallback")
;
return tid;
}
@@ -257,8 +259,8 @@
m_linkDown ();
if (m_activeProbing)
{
- SetState (WAIT_PROBE_RESP);
- SendProbeRequest ();
+ SetState (WAIT_PROBE_RESP);
+ SendProbeRequest ();
}
break;
case WAIT_ASSOC_RESP:
--- a/src/wifi/model/wifi-mac-header.h Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wifi/model/wifi-mac-header.h Fri Oct 03 02:24:42 2014 -0700
@@ -582,6 +582,13 @@
*/
const char * GetTypeString (void) const;
+ /**
+ * TracedCallback signature for WifiMacHeader
+ *
+ * \param [in] header The header
+ */
+ typedef void (* TracedCallback)(const WifiMacHeader &header);
+
private:
/**
--- a/src/wifi/model/wifi-mac.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wifi/model/wifi-mac.cc Fri Oct 03 02:24:42 2014 -0700
@@ -197,22 +197,27 @@
.AddTraceSource ("MacTx",
"A packet has been received from higher layers and is being processed in preparation for "
"queueing for transmission.",
- MakeTraceSourceAccessor (&WifiMac::m_macTxTrace))
+ MakeTraceSourceAccessor (&WifiMac::m_macTxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacTxDrop",
"A packet has been dropped in the MAC layer before being queued for transmission.",
- MakeTraceSourceAccessor (&WifiMac::m_macTxDropTrace))
+ MakeTraceSourceAccessor (&WifiMac::m_macTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacPromiscRx",
"A packet has been received by this device, has been passed up from the physical layer "
"and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&WifiMac::m_macPromiscRxTrace))
+ MakeTraceSourceAccessor (&WifiMac::m_macPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacRx",
"A packet has been received by this device, has been passed up from the physical layer "
"and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&WifiMac::m_macRxTrace))
+ MakeTraceSourceAccessor (&WifiMac::m_macRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("MacRxDrop",
"A packet has been dropped in the MAC layer after it has been passed up from the physical "
"layer.",
- MakeTraceSourceAccessor (&WifiMac::m_macRxDropTrace))
+ MakeTraceSourceAccessor (&WifiMac::m_macRxDropTrace),
+ "ns3::Packet::TracedCallback")
#if 0
// Not currently implemented in this device
.AddTraceSource ("Sniffer",
--- a/src/wifi/model/wifi-remote-station-manager.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wifi/model/wifi-remote-station-manager.cc Fri Oct 03 02:24:42 2014 -0700
@@ -301,16 +301,20 @@
MakeUintegerChecker<uint8_t> ())
.AddTraceSource ("MacTxRtsFailed",
"The transmission of a RTS by the MAC layer has failed",
- MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxRtsFailed))
+ MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxRtsFailed),
+ "ns3::Mac48Address::TracedCallback")
.AddTraceSource ("MacTxDataFailed",
"The transmission of a data packet by the MAC layer has failed",
- MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxDataFailed))
+ MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxDataFailed),
+ "ns3::Mac48Address::TracedCallback")
.AddTraceSource ("MacTxFinalRtsFailed",
"The transmission of a RTS has exceeded the maximum number of attempts",
- MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxFinalRtsFailed))
+ MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxFinalRtsFailed),
+ "ns3::Mac48Address::TracedCallback")
.AddTraceSource ("MacTxFinalDataFailed",
"The transmission of a data packet has exceeded the maximum number of attempts",
- MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxFinalDataFailed))
+ MakeTraceSourceAccessor (&WifiRemoteStationManager::m_macTxFinalDataFailed),
+ "ns3::Mac48Address::TracedCallback")
;
return tid;
}
--- a/src/wimax/model/bs-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wimax/model/bs-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -149,27 +149,40 @@
&BaseStationNetDevice::SetServiceFlowManager),
MakePointerChecker<ServiceFlowManager> ())
- .AddTraceSource ("BSTx", "A packet has been received from higher layers and is being processed in preparation for "
- "queueing for transmission.", MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsTxTrace))
+ .AddTraceSource ("BSTx",
+ "A packet has been received from higher layers "
+ "and is being processed in preparation "
+ "for queueing for transmission.",
+ MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsTxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("BSTxDrop",
- "A packet has been dropped in the MAC layer before being queued for transmission.",
- MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsTxDropTrace))
+ "A packet has been dropped in the MAC layer "
+ "before being queued for transmission.",
+ MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("BSPromiscRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsPromiscRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a promiscuous trace,",
+ MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("BSRx",
- "A packet has been received by this device, has been passed up from the physical layer "
- "and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsRxTrace))
+ "A packet has been received by this device, "
+ "has been passed up from the physical layer "
+ "and is being forwarded up the local protocol stack. "
+ "This is a non-promiscuous trace,",
+ MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("BSRxDrop",
- "A packet has been dropped in the MAC layer after it has been passed up from the physical "
- "layer.",
- MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsRxDropTrace));
+ "A packet has been dropped in the MAC layer "
+ "after it has been passed up from the physical layer.",
+ MakeTraceSourceAccessor (&BaseStationNetDevice::m_bsRxDropTrace),
+ "ns3::Packet::TracedCallback");
return tid;
}
--- a/src/wimax/model/simple-ofdm-wimax-phy.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wimax/model/simple-ofdm-wimax-phy.cc Fri Oct 03 02:24:42 2014 -0700
@@ -90,33 +90,42 @@
&SimpleOfdmWimaxPhy::SetTraceFilePath),
MakeStringChecker ())
- .AddTraceSource ("Rx", "Receive trace", MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_traceRx))
-
- .AddTraceSource ("Tx", "Transmit trace", MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_traceTx))
+ .AddTraceSource ("Rx", "Receive trace",
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_traceRx),
+ "ns3::PacketBurst::Traced::Ptr")
+ .AddTraceSource ("Tx", "Transmit trace",
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_traceTx),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("PhyTxBegin",
"Trace source indicating a packet has begun transmitting over the channel medium",
- MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyTxBeginTrace))
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyTxBeginTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("PhyTxEnd",
"Trace source indicating a packet has been completely transmitted over the channel",
- MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyTxEndTrace))
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyTxEndTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("PhyTxDrop",
"Trace source indicating a packet has been dropped by the device during transmission",
- MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyTxDropTrace))
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyTxDropTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("PhyRxBegin",
"Trace source indicating a packet has begun being received from the channel medium by the device",
- MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyRxBeginTrace))
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyRxBeginTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("PhyRxEnd",
"Trace source indicating a packet has been completely received from the channel medium by the device",
- MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyRxEndTrace))
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyRxEndTrace),
+ "ns3::PacketBurst::TracedCallback")
.AddTraceSource ("PhyRxDrop",
"Trace source indicating a packet has been dropped by the device during reception",
- MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyRxDropTrace));
+ MakeTraceSourceAccessor (&SimpleOfdmWimaxPhy::m_phyRxDropTrace),
+ "ns3::PacketBurst::TracedCallback");
return tid;
}
--- a/src/wimax/model/ss-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wimax/model/ss-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -183,22 +183,27 @@
.AddTraceSource ("SSTxDrop",
"A packet has been dropped in the MAC layer before being queued for transmission.",
- MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssTxDropTrace))
+ MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssTxDropTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("SSPromiscRx",
"A packet has been received by this device, has been passed up from the physical layer "
"and is being forwarded up the local protocol stack. This is a promiscuous trace,",
- MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssPromiscRxTrace))
+ MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssPromiscRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("SSRx",
"A packet has been received by this device, has been passed up from the physical layer "
"and is being forwarded up the local protocol stack. This is a non-promiscuous trace,",
- MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssRxTrace))
+ MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssRxTrace),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("SSRxDrop",
"A packet has been dropped in the MAC layer after it has been passed up from the physical "
"layer.",
- MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssRxDropTrace));
+ MakeTraceSourceAccessor (&SubscriberStationNetDevice::m_ssRxDropTrace),
+ "ns3::Packet::TracedCallback")
+ ;
return tid;
}
--- a/src/wimax/model/wimax-mac-queue.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wimax/model/wimax-mac-queue.cc Fri Oct 03 02:24:42 2014 -0700
@@ -88,13 +88,16 @@
MakeUintegerChecker<uint32_t> ())
.AddTraceSource ("Enqueue",
"Enqueue trace",
- MakeTraceSourceAccessor (&WimaxMacQueue::m_traceEnqueue))
+ MakeTraceSourceAccessor (&WimaxMacQueue::m_traceEnqueue),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("Dequeue",
"Dequeue trace",
- MakeTraceSourceAccessor (&WimaxMacQueue::m_traceDequeue))
+ MakeTraceSourceAccessor (&WimaxMacQueue::m_traceDequeue),
+ "ns3::Packet::TracedCallback")
.AddTraceSource ("Drop",
"Drop trace",
- MakeTraceSourceAccessor (&WimaxMacQueue::m_traceDrop))
+ MakeTraceSourceAccessor (&WimaxMacQueue::m_traceDrop),
+ "ns3::Packet::TracedCallback")
;
return tid;
}
--- a/src/wimax/model/wimax-net-device.cc Thu Dec 04 12:14:46 2014 -0800
+++ b/src/wimax/model/wimax-net-device.cc Fri Oct 03 02:24:42 2014 -0700
@@ -120,9 +120,15 @@
MakePointerAccessor (&WimaxNetDevice::m_broadcastConnection),
MakePointerChecker<WimaxConnection> ())
- .AddTraceSource ("Rx", "Receive trace", MakeTraceSourceAccessor (&WimaxNetDevice::m_traceRx))
+ .AddTraceSource ("Rx",
+ "Receive trace",
+ MakeTraceSourceAccessor (&WimaxNetDevice::m_traceRx),
+ "ns3::Packet::TracedCallback")
- .AddTraceSource ("Tx", "Transmit trace", MakeTraceSourceAccessor (&WimaxNetDevice::m_traceTx));
+ .AddTraceSource ("Tx",
+ "Transmit trace",
+ MakeTraceSourceAccessor (&WimaxNetDevice::m_traceTx),
+ "ns3::Packet::TracedCallback");
return tid;
}