[Sumover-dev] [svn commit] r4669 - vic/branches/cc/rtp

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Thu Mar  4 15:58:27 2010
New Revision: 4669

Modified:
   vic/branches/cc/rtp/session.cpp
   vic/branches/cc/rtp/transmitter.cpp

Log:
-- printing seqno and now at the real location 
   where the packet is sent off to Netowrk::send().

This way, it will represent "get XR first", then "sending packet".



Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Thu Mar  4 15:58:27 2010
@@ -459,6 +459,11 @@
 	// receive XR before sending
 	recv_xreport(ch_);
 
+	// get seqno
+	rtphdr* rh = (rtphdr *) pb->data;
+	fprintf(stderr, "\n\tnow: %f\tseqno: %d\n\n",
+		tx_now()-tx_now_offset_, ntohs(rh->rh_seqno));
+
 	// Using loop_layer for now to restrict transmission as well
 	if (pb->layer < loop_layer_) {
 	//	if ( pb->layer <0 ) exit(1);
@@ -483,6 +488,11 @@
 	// receive XR before sending
 	recv_xreport(ch_);
 
+	// get seqno
+	rtphdr* rh = (rtphdr *) pb->data;
+	fprintf(stderr, "\n\tnow: %f\tseqno: %d\n\n",
+		tx_now()-tx_now_offset_, ntohs(rh->rh_seqno));
+
 	if (pb->layer < loop_layer_) {
 		Network* n = dh_[pb->layer].net();
 		if (n != 0)

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Thu Mar  4 15:58:27 2010
@@ -316,8 +316,6 @@
 	//debug_msg("jack: %d\n", jack);
 	
 	if (ntohs(rh->rh_seqno) <= magic + jack) {
-		fprintf(stderr, "\n\tnow: %f\tseqno: %d\n\n", 
-			tx_now()-tx_now_offset_, ntohs(rh->rh_seqno));
 		// record seqno and timestamp at TfwcSndr side
 		tfwc_sndr_send(ntohs(rh->rh_seqno), 
 				tx_now()-tx_now_offset_,
@@ -375,8 +373,6 @@
 
 	// while packet seqno is within "cwnd + jack", send that packet
 	while (ntohs(rh->rh_seqno) <= magic + jack) {
-		fprintf(stderr, "\n\tnow: %f\tseqno: %d\n\n", 
-			tx_now()-tx_now_offset_, ntohs(rh->rh_seqno));
 		// record seqno and timestamp at TfwcSndr side
 		tfwc_sndr_send(ntohs(rh->rh_seqno), 
 				tx_now()-tx_now_offset_,