Changeset 4797

Timestamp:

05/06/10 19:02:29 (3 years ago)

Author:

soohyunc

Message:

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

Location:

vic/branches/cc

Files:

• cc/tfrc_rcvr.cpp (modified) (1 diff)
• cc/tfrc_rcvr.h (modified) (1 diff)
• cc/tfrc_sndr.cpp (modified) (1 diff)
• cc/tfrc_sndr.h (modified) (1 diff)
• cc/tfwc_sndr.cpp (modified) (1 diff)
• cc/tfwc_sndr.h (modified) (1 diff)
• rtp/session.cpp (modified) (2 diffs)
• rtp/transmitter.cpp (modified) (4 diffs)
• rtp/transmitter.h (modified) (2 diffs)

vic/branches/cc/cc/tfrc_rcvr.cpp

@@ -32 +32 @@
  */
 
+#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"
 

vic/branches/cc/cc/tfrc_rcvr.h

@@ -35 +35 @@
 #define vic_tfrc_rcvr_h
 
+#include <vector>
+#include <algorithm>
 #include "tfrc_sndr.h"
 

vic/branches/cc/cc/tfrc_sndr.cpp

@@ -36 +36 @@
 #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"

vic/branches/cc/cc/tfrc_sndr.h

@@ -35 +35 @@
 #define vic_tfrc_sndr_h
 
+#include "config.h"
 #include "bitmap.h"
 #include "cc_common.h"

vic/branches/cc/cc/tfwc_sndr.cpp

@@ -909 +909 @@
 
                 // trigger packet sending
-                cc_tfwc_output();
+                tfwc_output();
         }
 }

vic/branches/cc/cc/tfwc_sndr.h

@@ -65 +65 @@
 
         // 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() {};

vic/branches/cc/rtp/session.cpp

@@ -51 +51 @@
 #include "ntp-time.h"
 #include "session.h"
-#include "cc/tfwc_sndr.h"
-#include "cc/tfwc_rcvr.h"
 
 /* added to support the mbus 
@@ -1354 +1352 @@
                                 // 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;
 

vic/branches/cc/rtp/transmitter.cpp

@@ -253 +253 @@
                                 tail_ = head_ = pb;
                         pb->next = 0;
-                        cc_tfwc_output();
+                        tfwc_output();
                         is_buf_empty_ = false;
                 } 
@@ -264 +264 @@
                                 tail_ = head_ = pb;
                         pb->next = 0;
-                        cc_tfwc_output(pb);
+                        tfwc_output(pb);
                 }
                 break;
@@ -321 +321 @@
 }
 
-void Transmitter::cc_tfwc_output(pktbuf* pb) 
+void Transmitter::tfwc_output(pktbuf* pb) 
 {
         //cc_output_banner_top();
@@ -362 +362 @@
  * main TFWC CC output routines
  */
-void Transmitter::cc_tfwc_output(bool recv_by_ch)
-{
-        //cc_output_banner_top();
+void Transmitter::tfwc_output(bool recv_by_ch)
+{
+        //cc_output_banner_top("tfwc");
         // head of the RTP data packet buffer (pb)
         pktbuf* pb = head_;

vic/branches/cc/rtp/transmitter.h

@@ -101 +101 @@
         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();
@@ -176 +176 @@
 
         // 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");