Changeset 4224

Timestamp:

07/25/08 00:29:06 (5 years ago)

Author:

soohyunc

Message:

o start adding congestion control module

(added a method call in send method in transmitter.cpp)

Location:

vic/branches/cc/rtp

Files:

• transmitter.cpp (modified) (2 diffs)
• transmitter.h (modified) (1 diff)

vic/branches/cc/rtp/transmitter.cpp

@@ -89 +89 @@
         tail_(0),
         loop_layer_(1000),
-        loopback_(0)
+        loopback_(0),
+        is_cc_active_(1)
 {
         memset((char*)&mh_, 0, sizeof(mh_));
@@ -210 +211 @@
 void Transmitter::send(pktbuf* pb)
 {
-        ccman_->cc_parse_buf(pb);
-        if (!busy_) {
-                double delay = txtime(pb);
-                nextpkttime_ = gettimeofday_secs() + delay;
-                output(pb);
-                /*
-                 * emulate a transmit interrupt --
-                 * assume we will have more to send.
-                 */
-                msched(int(delay * 1e-3));
-                busy_ = 1;
+        if (is_cc_active_) {
+                cc_parse_buf(pb);
         } else {
-                if (head_ != 0) {
-                        tail_->next = pb;
-                        tail_ = pb;
-                } else
-                        tail_ = head_ = pb;
-                pb->next = 0;
-        }
+                if (!busy_) {
+                        double delay = txtime(pb);
+                        nextpkttime_ = gettimeofday_secs() + delay;
+                        output(pb);
+                        /*
+                         * emulate a transmit interrupt --
+                         * assume we will have more to send.
+                         */
+                        msched(int(delay * 1e-3));
+                        busy_ = 1;
+                } else {
+                        if (head_ != 0) {
+                                tail_->next = pb;
+                                tail_ = pb;
+                        } else
+                                tail_ = head_ = pb;
+                        pb->next = 0;
+                }
+        } // if (is_cc_active_)
 }
 

vic/branches/cc/rtp/transmitter.h

@@ -123 +123 @@
         static int nbufs_;
         static int nhdrs_;
+
+        /* Cc related variables */
+        bool is_cc_active_;             /* is Cc module activated?              */
 };