rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#4740 Sent heartbeat message between each chunk message

This commit is contained in:
Xinyu Hou 2016-09-13 12:19:47 -04:00 committed by Andrew Nelless
parent d8ace7fb4a
commit dc80ab4023
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/synergy/StreamChunker.cpp
View File

@ -35,8 +35,6 @@
using namespace std; using namespace std;
static const double g_fakeHeartbeatThreshold = 3;
static const size_t g_chunkSize = 512 * 1024; //512kb static const size_t g_chunkSize = 512 * 1024; //512kb
bool StreamChunker::s_isChunkingFile = false; bool StreamChunker::s_isChunkingFile = false;
@ -70,8 +68,6 @@ StreamChunker::sendFile(
// send chunk messages with a fixed chunk size // send chunk messages with a fixed chunk size
size_t sentLength = 0; size_t sentLength = 0;
size_t chunkSize = g_chunkSize; size_t chunkSize = g_chunkSize;
Stopwatch fakeHeartbeatStopwatch;
fakeHeartbeatStopwatch.start();
file.seekg (0, std::ios::beg); file.seekg (0, std::ios::beg);
while (true) { while (true) {
@ -81,10 +77,7 @@ StreamChunker::sendFile(
break; break;
} }
if (fakeHeartbeatStopwatch.getTime() > g_fakeHeartbeatThreshold) {
events->addEvent(Event(events->forFile().keepAlive(), eventTarget)); events->addEvent(Event(events->forFile().keepAlive(), eventTarget));
fakeHeartbeatStopwatch.reset();
}
// make sure we don't read too much from the mock data. // make sure we don't read too much from the mock data.
if (sentLength + chunkSize > size) { if (sentLength + chunkSize > size) {
@ -135,14 +128,9 @@ StreamChunker::sendClipboard(
// send clipboard chunk with a fixed size // send clipboard chunk with a fixed size
size_t sentLength = 0; size_t sentLength = 0;
size_t chunkSize = g_chunkSize; size_t chunkSize = g_chunkSize;
Stopwatch fakeHeartbeatStopwatch;
fakeHeartbeatStopwatch.start();
while (true) { while (true) {
if (fakeHeartbeatStopwatch.getTime() > g_fakeHeartbeatThreshold) {
events->addEvent(Event(events->forFile().keepAlive(), eventTarget)); events->addEvent(Event(events->forFile().keepAlive(), eventTarget));
fakeHeartbeatStopwatch.reset();
}
// make sure we don't read too much from the mock data. // make sure we don't read too much from the mock data.
if (sentLength + chunkSize > size) { if (sentLength + chunkSize > size) {