[Sumover-dev] [svn commit] r4370 - in vic/branches/cc: rtp

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

Author: soohyunc
Date: Tue Jan 27 12:44:44 2009
New Revision: 4370

Modified:
   vic/branches/cc/cc/tfwc_sndr.cpp
   vic/branches/cc/cc/tfwc_sndr.h
   vic/branches/cc/rtp/session.cpp

Log:
o  because, we are now able to know the RTP seqno(s) that the AckVec contains
   direclty by parsing "begins_" and "ends_" from the data receiver, we don't need
   to have a mechanism to seek the head seqno of the AckVec as we did earlier.

o  the head seqno of this AckVec contains is "end - 1", simply.


Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Tue Jan 27 12:44:44 2009
@@ -58,7 +58,7 @@
 	ntep_(0),
 	nsve_(0),
 	epoch_(1),
-	just_acked_(0)
+	jacked_(0)
 {
 	// allocate tsvec_ in memory
 	tsvec_ = (double *)malloc(sizeof(double)* TSZ);
@@ -126,7 +126,7 @@
 		//ackv_ = ackv;	// store ackvec
 
 		// just acked seqno (head of ackvec)
-		just_acked_ = get_head_pos(ackv) + aoa_;
+		jacked_ = end - 1;
 
 		// generate seqno vec
 		gen_seqvec(ackv);
@@ -136,7 +136,6 @@
 
 		// detect loss
 		int pt = mvec_[DUPACKS - 1] - 1;
-		u_int16_t begin, end;
 
 		// begin
 		begin = aoa_;

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Tue Jan 27 12:44:44 2009
@@ -71,7 +71,7 @@
 	inline u_int16_t tfwc_sndr_get_aoa() { return aoa_; }
 
 	// return just acked seqno
-	inline u_int16_t tfwc_sndr_just_acked() { return just_acked_; }
+	inline u_int16_t tfwc_sndr_jacked() { return jacked_; }
 
 	// return tfwc controlled cwnd value
 	inline u_int32_t tfwc_magic() { return cwnd_; };
@@ -126,9 +126,9 @@
 	}
 	// generate seqno vector (interpret ackvec to real sequence numbers)
 	inline void gen_seqvec(u_int16_t vec) {
-		int hseq = get_head_pos(vec) + aoa_;	// ackvec head seqno
+		int hseq = jacked_;		// ackvec head seqno
 		int cnt = hseq - aoa_;	// number of packets in ackvec
-		int offset = 0;		// if the bit is zero, then increment 
+		int offset = 0;			// if the bit is zero, then increment 
 		
 		for (int i = 0; i < cnt; i++) {
 			if( CHECK_BIT_AT(vec, (cnt-i)) )
@@ -202,7 +202,7 @@
 
 	u_int32_t *seqvec_;		// generated seqno vec
 	double *tsvec_;			// timestamp vector
-	u_int16_t just_acked_;	// just acked seqno (head of ackvec)
+	u_int16_t jacked_;		// just acked seqno (head of ackvec)
 	bool is_loss_;
 	bool is_first_loss_seen_;
 	bool is_tfwc_on_;

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Tue Jan 27 12:44:44 2009
@@ -1244,7 +1244,7 @@
 	int magic = (int) tfwc_magic();
 	debug_msg("cwnd: %d\n", magic);
 	// last acked seqno
-	int jack = (int) tfwc_sndr_just_acked();
+	int jack = (int) tfwc_sndr_jacked();
 	debug_msg("jack: %d\n", jack);
 
 	// while packet seqno is within "cwnd + jack", send that packet