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

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

Author: soohyunc
Date: Fri Aug 15 18:45:08 2008
New Revision: 4275

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

Log:
o  added a method to return TFWC controlled cwnd value
o  trigger the very first packet transmission (rtp/trasmitter.cpp)


Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Fri Aug 15 18:45:08 2008
@@ -78,6 +78,9 @@
 	// return ackofack
 	inline u_int16_t tfwc_sndr_get_aoa() { return aoa_; }
 
+	// return tfwc controlled cwnd value
+	inline u_int32_t tfwc_magic() { return cwnd_; };
+
 	// set timestamp in u_int32_t type (TfwcSndr)
 	inline u_int32_t tfwc_sndr_t_now() {
 		timeval tv;

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Fri Aug 15 18:45:08 2008
@@ -213,18 +213,18 @@
 void Transmitter::send(pktbuf* pb)
 {
 	if (is_cc_active_) {
+		// pass pktbuf to TfwcSndr
 		tfwc_sndr_send(pb);
-		if (!busy_) {
-			double delay = txtime(pb);
-			nextpkttime_ = gettimeofday_secs() + delay;
+
+		// get CC'd cwnd value
+		int magic = (int) tfwc_magic();
+
+		// pktbuf size
+		int queue = 100; 
+
+		if (queue <= magic) 
 			output(pb);
-			/*
-			 * emulate a transmit interrupt --
-			 * assume we will have more to send.
-			 */
-			msched(int(delay * 1e-3));
-			busy_ = 1;
-		} else {
+		else {
 			if (head_ != 0) {
 				tail_->next = pb;
 				tail_ = pb;