Moved time functions into a shared file.

[greproxy] / reorderer.cpp

diff --git a/reorderer.cpp b/reorderer.cpp
index 7b19d1d3435ab9e5b1ba702b38c6e70d295e3408..1fe3c08275ba859dbe8f6a3307e1e356ccc2d3a8 100644 (file)
--- a/reorderer.cpp
+++ b/reorderer.cpp
@@ -2,21 +2,17 @@
 
 #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)
-{
-       return b.tv_sec - a.tv_sec +
-               1e-6 * (b.tv_usec - a.tv_usec);
-}
-
 Reorderer::Reorderer(Sender* sender)
        : sender(sender), last_seq(-1)
 {
+       gettimeofday(&last_sent_packet, NULL);
 }
 
 void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
@@ -40,6 +36,14 @@ void Reorderer::send_packet(uint16_t proto, const string& data, int seq)
                // 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;
        packet.seq = seq;
        packet.proto = proto;
@@ -66,6 +70,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;