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

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

Author: soohyunc
Date: Thu May  6 19:02:29 2010
New Revision: 4797

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

Log:
added necessary header files into TfrcSndr/TfrcRcvr
and renamed cc_tfwc_ouput() to tfwc_output()



Modified: vic/branches/cc/cc/tfrc_rcvr.cpp
==============================================================================
--- vic/branches/cc/cc/tfrc_rcvr.cpp	(original)
+++ vic/branches/cc/cc/tfrc_rcvr.cpp	Thu May  6 19:02:29 2010
@@ -31,6 +31,15 @@
  * $Id$
  */
 
+#include "assert.h"
+#include "config.h"
+#include "timer.h"
+#include "rtp.h"
+#include "inet.h"
+#include "pktbuf-rtp.h"
+#include "vic_tcl.h"
+#include "module.h"
+#include "transmitter.h"
 #include "tfrc_rcvr.h"
 
 // TfrcRcvr instance

Modified: vic/branches/cc/cc/tfrc_rcvr.h
==============================================================================
--- vic/branches/cc/cc/tfrc_rcvr.h	(original)
+++ vic/branches/cc/cc/tfrc_rcvr.h	Thu May  6 19:02:29 2010
@@ -34,6 +34,8 @@
 #ifndef vic_tfrc_rcvr_h
 #define vic_tfrc_rcvr_h
 
+#include <vector>
+#include <algorithm>
 #include "tfrc_sndr.h"
 
 class TfrcRcvr {

Modified: vic/branches/cc/cc/tfrc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfrc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfrc_sndr.cpp	Thu May  6 19:02:29 2010
@@ -35,7 +35,12 @@
 #include <stdlib.h>
 #include <math.h>
 #include <sys/types.h>
-
+#include "assert.h"
+#include "rtp.h"
+#include "pktbuf-rtp.h"
+#include "vic_tcl.h"
+#include "module.h"
+#include "transmitter.h"
 #include "tfrc_sndr.h"
 #include "formula.h"
 

Modified: vic/branches/cc/cc/tfrc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfrc_sndr.h	(original)
+++ vic/branches/cc/cc/tfrc_sndr.h	Thu May  6 19:02:29 2010
@@ -34,6 +34,7 @@
 #ifndef vic_tfrc_sndr_h
 #define vic_tfrc_sndr_h
 
+#include "config.h"
 #include "bitmap.h"
 #include "cc_common.h"
 #include "cc_timer.h"

Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Thu May  6 19:02:29 2010
@@ -908,7 +908,7 @@
 			jacked_++;
 
 		// trigger packet sending
-		cc_tfwc_output();
+		tfwc_output();
 	}
 }
 

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Thu May  6 19:02:29 2010
@@ -64,8 +64,8 @@
 	virtual ~TfwcSndr() {};
 
 	// virtual functions
-	virtual void cc_tfwc_output(bool recv_by_ch=0) {UNUSED(recv_by_ch);};
-	virtual void cc_tfwc_output(pktbuf*) {};
+	virtual void tfwc_output(bool recv_by_ch=0) {UNUSED(recv_by_ch);};
+	virtual void tfwc_output(pktbuf*) {};
 	virtual void cc_tfwc_trigger(pktbuf* pb=0) {UNUSED(pb);};
 	virtual double tx_ts_offset() {};
 	virtual int tx_buf_size() {};

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Thu May  6 19:02:29 2010
@@ -50,8 +50,6 @@
 #include "timer.h"
 #include "ntp-time.h"
 #include "session.h"
-#include "cc/tfwc_sndr.h"
-#include "cc/tfwc_rcvr.h"
 
 /* added to support the mbus 
 #include "mbus_handler.h"*/
@@ -1353,7 +1351,7 @@
 
 				// we need to call Transmitter::output(pb) to make Ack driven
 				if(recv_by_ch)
-				cc_tfwc_output(recv_by_ch);
+				tfwc_output(recv_by_ch);
 				break;
 
 			case RBCC:

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Thu May  6 19:02:29 2010
@@ -252,7 +252,7 @@
 			} else
 				tail_ = head_ = pb;
 			pb->next = 0;
-			cc_tfwc_output();
+			tfwc_output();
 			is_buf_empty_ = false;
 		} 
 		// if not, check if cwnd allows send this packet
@@ -263,7 +263,7 @@
 			} else
 				tail_ = head_ = pb;
 			pb->next = 0;
-			cc_tfwc_output(pb);
+			tfwc_output(pb);
 		}
 		break;
 
@@ -320,7 +320,7 @@
 	} // switch (cc_type)
 }
 
-void Transmitter::cc_tfwc_output(pktbuf* pb) 
+void Transmitter::tfwc_output(pktbuf* pb) 
 {
 	//cc_output_banner_top();
 	
@@ -361,9 +361,9 @@
 /*
  * main TFWC CC output routines
  */
-void Transmitter::cc_tfwc_output(bool recv_by_ch)
+void Transmitter::tfwc_output(bool recv_by_ch)
 {
-	//cc_output_banner_top();
+	//cc_output_banner_top("tfwc");
 	// head of the RTP data packet buffer (pb)
 	pktbuf* pb = head_;
 

Modified: vic/branches/cc/rtp/transmitter.h
==============================================================================
--- vic/branches/cc/rtp/transmitter.h	(original)
+++ vic/branches/cc/rtp/transmitter.h	Thu May  6 19:02:29 2010
@@ -100,8 +100,8 @@
 	void flush();
 	void send(pktbuf*);
 	inline bool is_cc_on() { return is_cc_active_; }
-	virtual void cc_tfwc_output(bool recv_by_ch=0);
-	virtual void cc_tfwc_output(pktbuf*);
+	virtual void tfwc_output(bool recv_by_ch=0);
+	virtual void tfwc_output(pktbuf*);
 	virtual void cc_tfwc_trigger(pktbuf*);
 	void cc_tfrc_output();
 
@@ -175,8 +175,8 @@
 	static int nhdrs_;
 
 	// print banner
-	inline void cc_output_banner_top() {
-	fprintf(stderr,"\t--------entering cc_tfwc_output()-----------\n");
+	inline void cc_output_banner_top(const char* str) {
+	fprintf(stderr,"\t-------- entering %s_output() -----------\n", str);
 	fprintf(stderr,"\t|                                          |\n");
 	fprintf(stderr,"\tV                                          V\n");
 	}