John-Abrahams-MacBook-Pro:ns-3-dev john$ hg diff
diff -r a55aa66b5132 examples/tcp/tcp-bulk-send.cc
--- a/examples/tcp/tcp-bulk-send.cc Mon Jun 18 06:35:32 2012 -0700
+++ b/examples/tcp/tcp-bulk-send.cc Sat Jun 23 13:29:27 2012 -0700
@@ -37,6 +37,12 @@
NS_LOG_COMPONENT_DEFINE ("TcpBulkSendExample");
+
+void maxBytesSent (uint32_t maxBytes)
+{
+ NS_LOG_UNCOND (maxBytes << " Sent , Time :" << Simulator::Now ().GetSeconds ());
+}
+
int
main (int argc, char *argv[])
{
@@ -111,7 +117,7 @@
ApplicationContainer sinkApps = sink.Install (nodes.Get (1));
sinkApps.Start (Seconds (0.0));
sinkApps.Stop (Seconds (10.0));
-
+ sourceApps.Get (0)->TraceConnectWithoutContext ("MaxBytesSent", MakeCallback (maxBytesSent));
//
// Set up tracing if enabled
//
diff -r a55aa66b5132 src/applications/model/bulk-send-application.cc
--- a/src/applications/model/bulk-send-application.cc Mon Jun 18 06:35:32 2012 -0700
+++ b/src/applications/model/bulk-send-application.cc Sat Jun 23 13:29:27 2012 -0700
@@ -65,6 +65,8 @@
MakeTypeIdChecker ())
.AddTraceSource ("Tx", "A new packet is created and is sent",
MakeTraceSourceAccessor (&BulkSendApplication::m_txTrace))
+ .AddTraceSource ("MaxBytesSent", "MaxBytesSent sent",
+ MakeTraceSourceAccessor (&BulkSendApplication::m_maxBytesSent))
;
return tid;
}
@@ -190,6 +192,7 @@
// Check if time to close (all sent)
if (m_totBytes == m_maxBytes && m_connected)
{
+ m_maxBytesSent (m_maxBytes);
m_socket->Close ();
m_connected = false;
}
diff -r a55aa66b5132 src/applications/model/bulk-send-application.h
--- a/src/applications/model/bulk-send-application.h Mon Jun 18 06:35:32 2012 -0700
+++ b/src/applications/model/bulk-send-application.h Sat Jun 23 13:29:27 2012 -0700
@@ -93,6 +93,7 @@
uint32_t m_totBytes; // Total bytes sent so far
TypeId m_tid;
TracedCallback<Ptr<const Packet> > m_txTrace;
+ TracedCallback<uint32_t> m_maxBytesSent;
private:
void ConnectionSucceeded (Ptr<Socket> socket);
John-Abrahams-MacBook-Pro:ns-3-dev john$ ./waf --run "tcp-bulk-send --maxBytes=100000"
Waf: Entering directory `/Users/john/ns-3/ns-3-allinone/ns-3-dev/build'
Waf: Leaving directory `/Users/john/ns-3/ns-3-allinone/ns-3-dev/build'
'build' finished successfully (4.348s)
100000 Sent , Time :0.011344
Total Bytes Received: 100000
John-Abrahams-MacBook-Pro:ns-3-dev john$