1.1 --- a/examples/csma-broadcast.cc Fri Apr 11 11:19:54 2008 -0700
1.2 +++ b/examples/csma-broadcast.cc Fri Apr 11 11:20:05 2008 -0700
1.3 @@ -74,10 +74,8 @@
1.4 NetDeviceContainer n0 = csma.Install (c0);
1.5 NetDeviceContainer n1 = csma.Install (c1);
1.6
1.7 -
1.8 InternetStackHelper internet;
1.9 - internet.Install (c0);
1.10 - internet.Install (c1);
1.11 + internet.Install (c);
1.12
1.13 NS_LOG_INFO ("Assign IP Addresses.");
1.14 Ipv4AddressHelper ipv4;
2.1 --- a/examples/csma-multicast.cc Fri Apr 11 11:19:54 2008 -0700
2.2 +++ b/examples/csma-multicast.cc Fri Apr 11 11:20:05 2008 -0700
2.3 @@ -84,8 +84,7 @@
2.4
2.5 NS_LOG_INFO ("Add IP Stack.");
2.6 InternetStackHelper internet;
2.7 - internet.Install (c0);
2.8 - internet.Install (c1);
2.9 + internet.Install (c);
2.10
2.11 NS_LOG_INFO ("Assign IP Addresses.");
2.12 Ipv4AddressHelper ipv4Addr;
3.1 --- a/src/core/config.cc Fri Apr 11 11:19:54 2008 -0700
3.2 +++ b/src/core/config.cc Fri Apr 11 11:20:05 2008 -0700
3.3 @@ -190,7 +190,7 @@
3.4 {
3.5 // This is a call to GetObject
3.6 std::string tidString = item.substr (1, item.size () - 1);
3.7 - NS_LOG_DEBUG ("GetObject="<<tidString<<"on path="<<GetResolvedPath (""));
3.8 + NS_LOG_DEBUG ("GetObject="<<tidString<<" on path="<<GetResolvedPath (""));
3.9 TypeId tid = TypeId::LookupByName (tidString);
3.10 Ptr<Object> object = root->GetObject<Object> (tid);
3.11 if (object == 0)
4.1 --- a/src/core/object.cc Fri Apr 11 11:19:54 2008 -0700
4.2 +++ b/src/core/object.cc Fri Apr 11 11:20:05 2008 -0700
4.3 @@ -114,6 +114,13 @@
4.4 NS_ASSERT (!o->m_disposed);
4.5 NS_ASSERT (CheckLoose ());
4.6 NS_ASSERT (o->CheckLoose ());
4.7 +
4.8 + if (DoGetObject (o->m_tid))
4.9 + {
4.10 + NS_FATAL_ERROR ("Object::AggregateObject(): "
4.11 + "Multiple aggregation of objects of type " << o->m_tid.GetName ());
4.12 + }
4.13 +
4.14 Object *other = PeekPointer (o);
4.15 Object *next = m_next;
4.16 m_next = other->m_next;
5.1 --- a/src/core/traced-value.h Fri Apr 11 11:19:54 2008 -0700
5.2 +++ b/src/core/traced-value.h Fri Apr 11 11:20:05 2008 -0700
5.3 @@ -118,6 +118,12 @@
5.4 TracedCallback<T,T> m_cb;
5.5 };
5.6
5.7 +template <typename T>
5.8 +std::ostream& operator << (std::ostream& os, const TracedValue<T>& rhs)
5.9 +{
5.10 + return os<<rhs.Get();
5.11 +}
5.12 +
5.13 template <typename T, typename U>
5.14 bool operator == (const TracedValue<T> &lhs, const TracedValue<U> &rhs)
5.15 {
6.1 --- a/src/internet-node/tcp-socket.cc Fri Apr 11 11:19:54 2008 -0700
6.2 +++ b/src/internet-node/tcp-socket.cc Fri Apr 11 11:20:05 2008 -0700
6.3 @@ -31,6 +31,7 @@
6.4 #include "tcp-typedefs.h"
6.5 #include "ns3/simulator.h"
6.6 #include "ns3/packet.h"
6.7 +#include "ns3/trace-source-accessor.h"
6.8
6.9 #include <algorithm>
6.10
6.11 @@ -40,6 +41,20 @@
6.12
6.13 namespace ns3 {
6.14
6.15 +NS_OBJECT_ENSURE_REGISTERED (TcpSocket);
6.16 +
6.17 +TypeId
6.18 +TcpSocket::GetTypeId ()
6.19 +{
6.20 + static TypeId tid = TypeId("ns3::TcpSocket")
6.21 + .SetParent<Socket> ()
6.22 + .AddTraceSource ("CongestionWindow",
6.23 + "The TCP connection's congestion window",
6.24 + MakeTraceSourceAccessor (&TcpSocket::m_cWnd))
6.25 + ;
6.26 + return tid;
6.27 +}
6.28 +
6.29 TcpSocket::TcpSocket ()
6.30 : m_skipRetxResched (false),
6.31 m_dupAckCount (0),
6.32 @@ -899,7 +914,7 @@
6.33 {
6.34 NS_LOG_FUNCTION;
6.35 NS_LOG_LOGIC ("TcpSocket::Window() "<<this);
6.36 - return std::min (m_rxWindowSize, m_cWnd);
6.37 + return std::min (m_rxWindowSize, m_cWnd.Get());
6.38 }
6.39
6.40 uint32_t TcpSocket::AvailableWindow ()
6.41 @@ -1120,7 +1135,7 @@
6.42 }
6.43 else
6.44 { // Congestion avoidance mode, adjust by (ackBytes*segSize) / cWnd
6.45 - double adder = ((double) m_segmentSize * m_segmentSize) / m_cWnd;
6.46 + double adder = ((double) m_segmentSize * m_segmentSize) / m_cWnd.Get();
6.47 if (adder < 1.0)
6.48 {
6.49 adder = 1.0;
7.1 --- a/src/internet-node/tcp-socket.h Fri Apr 11 11:19:54 2008 -0700
7.2 +++ b/src/internet-node/tcp-socket.h Fri Apr 11 11:20:05 2008 -0700
7.3 @@ -22,6 +22,7 @@
7.4
7.5 #include <stdint.h>
7.6 #include "ns3/callback.h"
7.7 +#include "ns3/traced-value.h"
7.8 #include "ns3/socket.h"
7.9 #include "ns3/ptr.h"
7.10 #include "ns3/ipv4-address.h"
7.11 @@ -31,6 +32,7 @@
7.12 #include "sequence-number.h"
7.13 #include "rtt-estimator.h"
7.14
7.15 +
7.16 namespace ns3 {
7.17
7.18 class Ipv4EndPoint;
7.19 @@ -42,6 +44,7 @@
7.20 class TcpSocket : public Socket
7.21 {
7.22 public:
7.23 + static TypeId GetTypeId (void);
7.24 /**
7.25 * Create an unbound tcp socket.
7.26 */
7.27 @@ -152,12 +155,12 @@
7.28 SequenceNumber m_firstPendingSequence;
7.29
7.30 // Window management
7.31 - uint32_t m_segmentSize; // SegmentSize
7.32 - uint32_t m_rxWindowSize;
7.33 - uint32_t m_advertisedWindowSize; // Window to advertise to peer
7.34 - uint32_t m_cWnd; // Congestion window
7.35 - uint32_t m_ssThresh; // Slow Start Threshold
7.36 - uint32_t m_initialCWnd; // Initial (and reset) value for cWnd
7.37 + uint32_t m_segmentSize; //SegmentSize
7.38 + uint32_t m_rxWindowSize;
7.39 + uint32_t m_advertisedWindowSize; //Window to advertise
7.40 + TracedValue<uint32_t> m_cWnd; //Congestion window
7.41 + uint32_t m_ssThresh; //Slow Start Threshold
7.42 + uint32_t m_initialCWnd; //Initial cWnd value
7.43
7.44 // Round trip time estimation
7.45 Ptr<RttEstimator> m_rtt;
8.1 --- a/src/node/tcp.cc Fri Apr 11 11:19:54 2008 -0700
8.2 +++ b/src/node/tcp.cc Fri Apr 11 11:20:05 2008 -0700
8.3 @@ -30,52 +30,52 @@
8.4 {
8.5 static TypeId tid = TypeId ("ns3::Tcp")
8.6 .SetParent<SocketFactory> ()
8.7 - .AddAttribute ("TcpDefaultSegmentSize",
8.8 - "Default TCP maximum segment size in bytes (may be adjusted based on MTU discovery)",
8.9 - Uinteger (536),
8.10 - MakeUintegerAccessor (&Tcp::m_defaultSegSize),
8.11 - MakeUintegerChecker<uint32_t> ())
8.12 - .AddAttribute ("TcpDefaultAdvertisedWindowSize",
8.13 + .AddAttribute ("DefaultSegmentSize",
8.14 + "Default TCP maximum segment size in bytes (may be adjusted based on MTU discovery)",
8.15 + Uinteger (536),
8.16 + MakeUintegerAccessor (&Tcp::m_defaultSegSize),
8.17 + MakeUintegerChecker<uint32_t> ())
8.18 + .AddAttribute ("DefaultAdvertisedWindowSize",
8.19 "Default TCP advertised window size (bytes)",
8.20 Uinteger (0xffff),
8.21 MakeUintegerAccessor (&Tcp::m_defaultAdvWin),
8.22 MakeUintegerChecker<uint32_t> ())
8.23 - .AddAttribute ("TcpDefaultSlowStartThreshold",
8.24 + .AddAttribute ("DefaultSlowStartThreshold",
8.25 "Default TCP slow start threshold (bytes)",
8.26 Uinteger (0xffff),
8.27 MakeUintegerAccessor (&Tcp::m_defaultSsThresh),
8.28 MakeUintegerChecker<uint32_t> ())
8.29 - .AddAttribute ("TcpDefaultTxBufferSize",
8.30 + .AddAttribute ("DefaultTxBufferSize",
8.31 "Default TCP maximum transmit buffer size (bytes)",
8.32 Uinteger (0xffffffffl),
8.33 MakeUintegerAccessor (&Tcp::m_defaultTxBuffer),
8.34 MakeUintegerChecker<uint32_t> ())
8.35 - .AddAttribute ("TcpDefaultRxBufferSize",
8.36 + .AddAttribute ("DefaultRxBufferSize",
8.37 "Default TCP maximum receive buffer size (bytes)",
8.38 Uinteger (0xffffffffl),
8.39 MakeUintegerAccessor (&Tcp::m_defaultRxBuffer),
8.40 MakeUintegerChecker<uint32_t> ())
8.41 - .AddAttribute ("TcpDefaultInitialCongestionWindowSize",
8.42 + .AddAttribute ("DefaultInitialCongestionWindowSize",
8.43 "Default TCP initial congestion window size (segments)",
8.44 Uinteger (1),
8.45 MakeUintegerAccessor (&Tcp::m_defaultInitialCwnd),
8.46 MakeUintegerChecker<uint32_t> ())
8.47 - .AddAttribute ("TcpDefaultConnTimeout",
8.48 + .AddAttribute ("DefaultConnTimeout",
8.49 "Default TCP retransmission timeout when opening connection (seconds)",
8.50 Uinteger (3),
8.51 MakeUintegerAccessor (&Tcp::m_defaultConnTimeout),
8.52 MakeUintegerChecker<uint32_t> ())
8.53 - .AddAttribute ("TcpDefaultConnCount",
8.54 + .AddAttribute ("DefaultConnCount",
8.55 "Default number of connection attempts (SYN retransmissions) before returning failure",
8.56 Uinteger (6),
8.57 MakeUintegerAccessor (&Tcp::m_defaultConnCount),
8.58 MakeUintegerChecker<uint32_t> ())
8.59 - .AddAttribute ("TcpDefaultDelAckTimeout",
8.60 + .AddAttribute ("DefaultDelAckTimeout",
8.61 "Default timeout value for TCP delayed acks, in seconds",
8.62 Double (0.2),
8.63 MakeDoubleAccessor (&Tcp::m_defaultDelAckTimeout),
8.64 MakeDoubleChecker<double> ())
8.65 - .AddAttribute ("TcpDefaultDelAckCount",
8.66 + .AddAttribute ("DefaultDelAckCount",
8.67 "Default number of packets to wait before sending a TCP ack",
8.68 Uinteger (2),
8.69 MakeUintegerAccessor (&Tcp::m_defaultDelAckCount),