X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=reorderer.cpp;h=c2823e5254c94a85c7201d61efbb613d27d88073;hb=bbcd8293ef911c2bfcae0327dc15266b6d6b0bee;hp=e4cafe124416d19b1ae231fce9d201c69d72f7de;hpb=8382a720affa71d054eba6761473e7b9fcfb725a;p=greproxy

diff --git a/reorderer.cpp b/reorderer.cpp
index e4cafe1..c2823e5 100644
--- 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;
 	}
 
@@ -64,6 +66,8 @@ 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;
@@ -84,11 +88,18 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int 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;
 			}