Changeset 4519

Timestamp:

10/16/09 16:00:34 (4 years ago)

Author:

soohyunc

Message:

ackofack packet seqno is excluded when detecting packet loss (this is obvious).

Files:

• vic/branches/cc/cc/tfwc_sndr.cpp (modified) (7 diffs)

vic/branches/cc/cc/tfwc_sndr.cpp

@@ -183 +183 @@
 
                 // detect loss
-                //      @begin: aoa_
+                //      @begin: aoa_+1
                 //      @end: mvec_[DUPACKS] - 1
-                is_loss_ = detect_loss(mvec_[DUPACKS-1]-1, aoa_);
+                is_loss_ = detect_loss(mvec_[DUPACKS-1]-1, aoa_+1);
 
                 // TFWC is not turned on (i.e., no packet loss yet)
@@ -237 +237 @@
         // number of seqvec elements 
         // (i.e., number of packets that this AckVec is representing)
-        int numElm = ends_ - begins_;
+        int num_elm = ends_ - begins_;
 
         // number of AckVec chunks
-        int x = numElm%BITLEN;
-        int num_chunks = numElm/BITLEN + (x > 0);
+        int x = num_elm%BITLEN;
+        int num_chunks = num_elm/BITLEN + (x > 0);
 
         int i, j, k = 0;
-        // start of seqvec
-        //int start = jacked_;
-        int start = begins_;    // lowest seqno
+
+        // start of seqvec (lowest seqno)
+        int start = begins_;
 
         for (i = 0; i < num_chunks-1; i++) {
@@ -256 +256 @@
                 }
         }
+
         int a = (x == 0) ? BITLEN : x;
         for (i = a; i > 0; i--) {
@@ -265 +266 @@
 
         // therefore, the number of seqvec is:
-        int num_seqvec = numElm - num_loss_;
+        int num_seqvec = num_elm - num_loss_;
         // printing retrieved sequence numbers from received AckVec
         print_seqvec(num_seqvec);
@@ -276 +277 @@
 bool TfwcSndr::detect_loss(int end, int begin) {
         bool ret;       // 'true' when there is a loss
-        bool gotIn = false;
+        bool is_there = false;
         int count = 0; // packet loss counter
 
         // number of tempvec element when no loss
-        int numelm = (end - begin < 0) ? 0 : end - begin;
-        u_int32_t tempvec[numelm];
+        int num_elm = ((end - begin  + 1) < 0) ? 0 : (end - begin + 1);
+        u_int32_t tempvec[num_elm];
 
         // generate tempvec elements
         printf("\tcomparing numbers: (");
-        for (int i = 0; i < numelm; i++) {
-                tempvec[i] = (begin + 1) + i;
+        for (int i = 0; i < num_elm; i++) {
+                tempvec[i] = begin + i;
                 printf(" %d", tempvec[i]);
         } printf(" )\n");
 
         // number of seqvec element
-        int numseq = ends_ - begins_ - num_loss_;
+        int num_seqvec = num_elm - num_loss_;
 
         // compare tempvec and seqvec
-        for (int i = 0; i < numelm; i++) {
-                for (int j = numseq-1; j >= 0; j--) {
+        for (int i = 0; i < num_elm; i++) {
+                for (int j = num_seqvec-1; j >= 0; j--) {
                         if (tempvec[i] == seqvec_[j]) {
-                                gotIn = true;
+                                is_there = true;
                                 // we found it, so reset count
                                 count = 0; break;
                         } else {
-                                gotIn = false; 
+                                is_there = false; 
                                 count++;
                         }
@@ -307 +308 @@
 
                 // record the very first lost packet seqno
-                if(!gotIn) {
+                if(!is_there) {
                         if(!is_first_loss_seen_) 
                                 first_lost_pkt_ = tempvec[i];
@@ -315 +316 @@
         // store tempvec elements for updating loss history
         first_elm_ = tempvec[0];
-        last_elm_ = first_elm_ + (numelm - 1);
+        last_elm_ = first_elm_ + num_elm;
 
         return ret = (count > 0) ? true : false;