X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=reorderer.cpp;h=2533aadc042064a7577e55c45a56718ad04faa6f;hb=0d7a8406547587b7b1adad9374b4f4985f49dd84;hp=7b19d1d3435ab9e5b1ba702b38c6e70d295e3408;hpb=1bacf4bb3d9dbd9f07e33b5676f5a1be43cd83a5;p=greproxy

diff --git a/reorderer.cpp b/reorderer.cpp
index 7b19d1d..2533aad 100644
--- a/reorderer.cpp
+++ b/reorderer.cpp
@@ -2,21 +2,32 @@
 
 #include "reorderer.h"
 #include "protocol.h"
+#include "timeutil.h"
 
-#define PACKET_BUFFER_SIZE 100
-#define TIMEOUT_SEC 0.100
+#define PACKET_BUFFER_SIZE 1000
+#define TIMEOUT_SEC 1.000
 
 using namespace std;
 
-double tdiff(const timeval& a, const timeval& b)
+Reorderer::Reorderer(Sender* sender)
+	: sender(sender), last_seq(-1)
 {
-	return b.tv_sec - a.tv_sec +
-		1e-6 * (b.tv_usec - a.tv_usec);
+	gettimeofday(&last_sent_packet, NULL);
 }
 
-Reorderer::Reorderer(Sender* sender)
-	: sender(sender), last_seq(-1)
+void Reorderer::possibly_adjust_tv(timeval *tv)
 {
+	if (packet_buffer.empty()) {
+		return;
+	}
+
+	timeval now;
+	gettimeofday(&now, NULL);
+	timeval tdiff = subtract_timeval_saturate(
+		offset_timeval_seconds(packet_buffer.top().ts, TIMEOUT_SEC), now);
+	if (less_than(tdiff, *tv)) {
+		*tv = tdiff;
+	}
 }
 
 void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
@@ -36,8 +47,14 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 			last_seq + 1, packet_buffer.top().seq);
 		silence = true;
 		last_seq = packet_buffer.top().seq - 1;
-		// TODO: Rerun immediately after we've cleared out,
-		// in case there are more timeouts.
+	}
+
+	// In case of restarts.
+	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);
+		last_seq = seq - 1;
 	}
 
 	GREPacket packet;
@@ -66,6 +83,7 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
 		sender->send_packet(proto, data, 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;