From 1659f9f018fa01d4d1bd06fee0164888827808bd Mon Sep 17 00:00:00 2001 From: Xinyu Hou Date: Wed, 22 Jul 2015 15:24:51 +0100 Subject: [PATCH] Added keep alive massge before each data transfer #4712 --- src/lib/synergy/StreamChunker.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/lib/synergy/StreamChunker.cpp b/src/lib/synergy/StreamChunker.cpp index 080938bf..380a37a3 100644 --- a/src/lib/synergy/StreamChunker.cpp +++ b/src/lib/synergy/StreamChunker.cpp @@ -31,7 +31,6 @@ #include -#define KEEP_ALIVE_THRESHOLD 1 #define SEND_THRESHOLD 0.005f using namespace std; @@ -73,9 +72,7 @@ StreamChunker::sendFile( // send chunk messages with a fixed chunk size size_t sentLength = 0; size_t chunkSize = s_chunkSize; - Stopwatch keepAliveStopwatch; Stopwatch sendStopwatch; - keepAliveStopwatch.start(); sendStopwatch.start(); file.seekg (0, std::ios::beg); @@ -86,12 +83,9 @@ StreamChunker::sendFile( break; } - if (keepAliveStopwatch.getTime() > KEEP_ALIVE_THRESHOLD) { - events->addEvent(Event(events->forFile().keepAlive(), eventTarget)); - keepAliveStopwatch.reset(); - } - if (sendStopwatch.getTime() > SEND_THRESHOLD) { + events->addEvent(Event(events->forFile().keepAlive(), eventTarget)); + // make sure we don't read too much from the mock data. if (sentLength + chunkSize > size) { chunkSize = size - sentLength; @@ -146,9 +140,7 @@ StreamChunker::sendClipboard( // send clipboard chunk with a fixed size size_t sentLength = 0; size_t chunkSize = s_chunkSize; - Stopwatch keepAliveStopwatch; Stopwatch sendStopwatch; - keepAliveStopwatch.start(); sendStopwatch.start(); while (true) { @@ -157,13 +149,10 @@ StreamChunker::sendClipboard( LOG((CLOG_DEBUG "clipboard transmission interrupted")); break; } - - if (keepAliveStopwatch.getTime() > KEEP_ALIVE_THRESHOLD) { - events->addEvent(Event(events->forFile().keepAlive(), eventTarget)); - keepAliveStopwatch.reset(); - } if (sendStopwatch.getTime() > SEND_THRESHOLD) { + events->addEvent(Event(events->forFile().keepAlive(), eventTarget)); + // make sure we don't read too much from the mock data. if (sentLength + chunkSize > size) { chunkSize = size - sentLength;