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

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

Author: soohyunc
Date: Tue May 11 16:55:46 2010
New Revision: 4826

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

Log:
the byte-mode cwnd operation had a little mistake - Vic had to get cwnd(bytes)
before determining send packets (by comparing packet size in bytes and cwnd in
bytes etc.)



Modified: vic/branches/cc/cc/plots.sh
==============================================================================
--- vic/branches/cc/cc/plots.sh	(original)
+++ vic/branches/cc/cc/plots.sh	Tue May 11 16:55:46 2010
@@ -59,6 +59,8 @@
 
 set mxtics 2
 set mytics 2
+set xrange [$1:$2]
+set yrange [0:]
 
 plot \
 "enct.xg" with lp title "encoding time", \

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Tue May 11 16:55:46 2010
@@ -381,11 +381,14 @@
 	  int len = 0;
 	  int num_acked = 0;
 
+	  // cwnd (in bytes)
+	  int b_magic = tfwc_sndr_.b_magic();
+
 	  // this output called upon ack clock
 	  if(recv_by_ch)
 	  num_acked = tfwc_sndr_.b_jacked();
 
-	  while(pb->len < tfwc_sndr_.b_magic() + num_acked - len) {
+	  while(pb->len < b_magic + num_acked - len) {
 		len += pb->len;
 		// move head pointer
 		head_ = pb->next;