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

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

Author: soohyunc
Date: Wed Apr  7 14:05:59 2010
New Revision: 4764

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

Log:
continue from Revision 4752
(in preparation of cwnd computation in bytes)



Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Wed Apr  7 14:05:59 2010
@@ -371,7 +371,19 @@
 	// TFWC is turned on, so compute congestion window
 	else
 		cwnd_in_packets(revert);
-} 
+}
+
+/*
+ * TFWC congestion window in bytes
+ */
+void TfwcSndr::window_in_bytes(bool revert) {
+	// TFWC is not turned on (i.e., no packet loss yet)
+	if(!is_tfwc_on_)
+		tcp_like_increase();
+	// TFWC is turned on, so compute congestion window
+	else
+		cwnd_in_bytes(revert);
+}
 
 /*
  * detect out-of-ordered ack delivery
@@ -596,7 +608,11 @@
  * core part for congestion window control
  * (cwnd is in bytes)
  */
-void cwnd_in_bytes() {
+void TfwcSndr::cwnd_in_bytes(bool revert) {
+	if(!revert) {
+	loss_history();
+	avg_loss_interval();
+	}
 }
 
 /*

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Wed Apr  7 14:05:59 2010
@@ -190,7 +190,8 @@
 	void window_in_packets(bool revert);
 	void cwnd_in_packets(bool revert);
 	// TFWC congestion window in bytes
-	void cwnd_in_bytes();
+	void window_in_bytes(bool revert);
+	void cwnd_in_bytes(bool revert);
 
 	// calcuate average loss interval
 	void avg_loss_interval();