Make tungre output statistics on stderr every 10 seconds.

[greproxy] / reorderer.cpp

diff --git a/reorderer.cpp b/reorderer.cpp
index 2533aadc042064a7577e55c45a56718ad04faa6f..697f8189d3a05da187d0fb74ed8149f86f50d19c 100644 (file)
--- a/reorderer.cpp
+++ b/reorderer.cpp
@@ -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;
        }
 
@@ -80,13 +82,16 @@ 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()) {
+                       ++num_reorders;
+                       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;
+                       }
                }
        }
 }