Merge branch 'master' of /srv/git.sesse.net/www/greproxy

[greproxy] / reorderer.cpp

diff --git a/reorderer.cpp b/reorderer.cpp
index 2533aadc042064a7577e55c45a56718ad04faa6f..71b90c54d7433308ea0684574768b6bd990ecfa5 100644 (file)
--- a/reorderer.cpp
+++ b/reorderer.cpp
@@ -30,7 +30,7 @@ void Reorderer::possibly_adjust_tv(timeval *tv)
        }
 }
 
-void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
+void Reorderer::send_packet(uint16_t proto, const string& data, uint32_t seq)
 {
        timeval now;
        gettimeofday(&now, NULL);
@@ -40,12 +40,14 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
                printf("Gave up waiting for packets [%d,%d> (buffer full)\n",
                        last_seq + 1, packet_buffer.top().seq);
                silence = true;
+               num_lost_packets += packet_buffer.top().seq - (last_seq + 1);
                last_seq = packet_buffer.top().seq - 1;
        } else if (!packet_buffer.empty() &&
                   tdiff(packet_buffer.top().ts, now) > TIMEOUT_SEC) {
                printf("Gave up waiting for packets [%d,%d> (timeout)\n",
                        last_seq + 1, packet_buffer.top().seq);
                silence = true;
+               num_lost_packets += packet_buffer.top().seq - (last_seq + 1);
                last_seq = packet_buffer.top().seq - 1;
        }
 
@@ -53,7 +55,7 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
        if (packet_buffer.empty() &&
            seq < last_seq &&
            tdiff(last_sent_packet, now) > 5.0) {
-               printf("No good data for five seconds, resetting sequence to %d\n", seq);
+               printf("No good data for five seconds, resetting sequence to %u\n", seq);
                last_seq = seq - 1;
        }
 
@@ -64,11 +66,13 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
        packet.ts = now;
        packet_buffer.push(packet);
 
+       bool did_reorder = false;
+
        while (!packet_buffer.empty() &&
               (last_seq == -1 || packet_buffer.top().seq <= last_seq + 1)) {
-               int front_seq = packet_buffer.top().seq;
+               uint32_t front_seq = packet_buffer.top().seq;
                if (front_seq < last_seq + 1) {
-                       printf("Duplicate packet or way out-of-order: seq=%d front_seq=%d\n",
+                       printf("Duplicate packet or way out-of-order: seq=%u front_seq=%u\n",
                                front_seq, last_seq + 1);
                        packet_buffer.pop();
                        continue;
@@ -80,15 +84,22 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
                //}
                const string &data = packet_buffer.top().data;
                check_ts_discontinuity(packet_buffer.top().proto, data, silence);
-               sender->send_packet(proto, data, seq);
+               sender->send_packet(packet_buffer.top().proto, data, packet_buffer.top().seq);
                packet_buffer.pop();
                last_seq = front_seq;
                last_sent_packet = now;
-               if (!silence && !packet_buffer.empty()) {
-                       printf("Reordering with packet buffer size %d: seq=%d new_front_seq=%d\n", int(packet_buffer.size()), front_seq, packet_buffer.top().seq);
-                       silence = true;
+               if (!packet_buffer.empty()) {
+                       did_reorder = true;
+                       if (!silence) {
+                               printf("Reordering with packet buffer size %d: seq=%d new_front_seq=%d\n", int(packet_buffer.size()), front_seq, packet_buffer.top().seq);
+                               silence = true;
+                       }
                }
        }
+
+       if (did_reorder) {
+               ++num_reorders;
+       }
 }
 
 void Reorderer::check_ts_discontinuity(uint16_t proto, const string &data, bool silence)
@@ -105,8 +116,11 @@ void Reorderer::check_ts_discontinuity(uint16_t proto, const string &data, bool
                        int cc = pkt[3] & 0xf;
                        if (has_payload) {
                                int last_cc = ccs[pid];
-                               if (!silence && cc != ((last_cc + 1) & 0xf)) {
-                                       printf("Pid %d discontinuity (expected %d, got %d)\n", pid, (last_cc + 1) & 0xf, cc);
+                               if (cc != ((last_cc + 1) & 0xf)) {
+                                       if (!silence) {
+                                               printf("Pid %d discontinuity (expected %d, got %d)\n", pid, (last_cc + 1) & 0xf, cc);
+                                       }
+                                       ++num_ts_discontinuities;
                                }
                                ccs[pid] = cc;
                        }