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

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

Author: soohyunc
Date: Thu Apr  1 19:32:17 2010
New Revision: 4756

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

Log:
Subsequently (Revision 4755 and 4753), we need to re-initialize state variables
depending on the situations (is history reverted? or not?)




Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Thu Apr  1 19:32:17 2010
@@ -234,6 +234,9 @@
 		  revert = revert_interval(jacked_);
 		  // then, update cwnd
 		  cwnd_in_packets(revert);
+		  print_cwnd();
+		  // finally, reset variables
+		  reset_var(revert);
 		  return;
 		}
 		//
@@ -248,6 +251,8 @@
 		  // then, update cwnd
 		  cwnd_in_packets(revert);
 		  print_cwnd();
+		  // finally, reset variables
+		  reset_var(revert);
 		  return;
 		}
 		//
@@ -310,7 +315,8 @@
 		// then, update cwnd
 		cwnd_in_packets(revert);
 		print_cwnd();
-		reset_var();
+		// finally, reset variables
+		reset_var(revert);
 		return;
 	}
 
@@ -340,7 +346,7 @@
 		new_rto(tao_);
 	
 	// reset variables for the next pkt reception
-	reset_var();
+	reset_var(revert);
   }
   break;
 
@@ -377,11 +383,12 @@
 	return false;
 }
 
-void TfwcSndr::reset_var() {
+void TfwcSndr::reset_var(bool reverted) {
 	// init vars------------*
 	num_missing_ = 0;
 	//----------------------*
 
+	if(!reverted) {
 	// store jack'ed
 	store(jacked_);
 	// declare pvec to store ackv
@@ -390,6 +397,7 @@
 	// store ackv
 	copy_ackv(num_vec_);
 	//print_vec("stored ackvec", pvec_, num_vec_);
+	}
 
 	// finally, free ackvec
 	free(ackv_);

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Thu Apr  1 19:32:17 2010
@@ -127,7 +127,7 @@
 	void gen_refvec(int end, int begin);
 
 	// reset variables
-	void reset_var();
+	void reset_var(bool reverted);
 
 	// get the first position in ackvec where 1 is marked
 	inline u_int16_t get_head_pos(u_int16_t ackvec) {