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

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

Author: soohyunc
Date: Fri Feb 12 14:28:12 2010
New Revision: 4612

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

Log:
Transmitter::flush() shouldn't be really called by encoder. It will destroy
the Ack-cloking mechanism. 

By the was, it will also destroy the bit-rate limited feature in
the original Vic implementation, but we are reverting it to the original state
anyway even though we acknowledge the problem,




Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Fri Feb 12 14:28:12 2010
@@ -388,28 +388,19 @@
 
 void Transmitter::flush()
 {
-	//fprintf(stderr, "\nTransmitter::flush()\n\n");
-	switch (cc_type_) {
-		case WBCC:
-			cc_tfwc_output();
-			break;
-		case RBCC:
-			cc_tfrc_output();
-			break;
-		case NOCC:
-		default:
-			if (busy_) {
-				busy_ = 0;
-				cancel();
-			}
+	if (!is_cc_on()) {
+		if (busy_) {
+			busy_ = 0;
+			cancel();
+		}
 
-			pktbuf* p = head_;
-			while (p != 0) {
-				pktbuf* n = p->next;
-				output(p);
-				p = n;
-			}
-			head_ = 0;
+		pktbuf* p = head_;
+		while (p != 0) {
+			pktbuf* n = p->next;
+			output(p);
+			p = n;
+		}
+		head_ = 0;
 	}
 }