[Sumover-dev] [svn commit] r4635 - vic/branches/cc/cc

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

Author: soohyunc
Date: Mon Feb 22 19:26:54 2010
New Revision: 4635

Modified:
   vic/branches/cc/cc/tfwc_sndr.cpp

Log:
fixed sampled RTT calculation:
	:= (now - timestamp associated with XR's seqno)



Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Mon Feb 22 19:26:54 2010
@@ -114,7 +114,7 @@
 	tsvec_[seqno_%TSZ] = now_;
 
 	//fprintf(stderr, "\t>> now_:%f, tsvec_[%d]:%f\n", 
-	//	now_, seqno_%TSZ - 1, tsvec_[seqno_%TSZ-1]);
+	//	now_, seqno_%TSZ, tsvec_[seqno_%TSZ]);
 
 	// sequence number must be greater than zero
 	//assert (seqno_ > 0);
@@ -192,7 +192,9 @@
 		aoa_ = ackofack(); 
 
 		// update RTT with the sampled RTT
-		tao_ = now() - tsvec_[ends_%TSZ];
+		tao_ = now() - tsvec_[jacked_%TSZ];
+		//fprintf(stderr, "\t<< :now_%f, tsvec_[%d]:%f, rtt: %f\n", 
+		//	now(), jacked_%TSZ, tsvec_[jacked_%TSZ], tao_);
 		update_rtt(tao_);
 
 		// initialize variables for the next pkt reception