debauchee/barrier
1
1
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2024-11-23 20:12:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Patch by Jerry:

Browse Source 
- Added fixed pause between raising each file transfer event
- Removed redundant member variables in CClient and CServer
This commit is contained in:
Nick Bolton 2013-07-26 14:10:06 +00:00
parent 811cfd146d
commit 289f1ff71f
5 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/client/CClient.cpp
View File

@ -46,8 +46,6 @@
// CClient
//
const size_t CClient::m_chunkSize = 1024 * 512; // 512kb
CClient::CClient(IEventQueue* events,
const CString& name, const CNetworkAddress& address,
ISocketFactory* socketFactory,

1
src/lib/client/CClient.h
View File

@ -222,7 +222,6 @@ private:
CCryptoOptions m_crypto;
std::size_t m_expectedFileSize;
CString m_receivedFileData;
static const size_t m_chunkSize;
};
#endif

2
src/lib/server/CServer.cpp
View File

@ -48,8 +48,6 @@
// CServer
//
const size_t CServer::m_chunkSize = 1024 * 512; // 512kb
CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen, IEventQueue* events) :
m_events(events),
m_mock(false),

1
src/lib/server/CServer.h
View File

@ -468,7 +468,6 @@ private:
// file transfer
size_t m_expectedFileSize;
CString m_receivedFileData;
static const size_t m_chunkSize;
CString m_fileTransferSrc;
CString m_fileTransferDes;
};

9
src/lib/synergy/CFileChunker.cpp
View File

@ -22,10 +22,13 @@
#include "IEventQueue.h"
#include "CEventTypes.h"
#include "CLog.h"
#include "CStopwatch.h"
#include <fstream>
#include <sstream>
#include <stdexcept>
#define PAUSE_TIME_HACK 0.1
using namespace std;
const size_t CFileChunker::m_chunkSize = 512 * 1024; // 512kb
@ -57,8 +60,11 @@ CFileChunker::sendFileChunks(char* filename, IEventQueue* events, void* eventTar
// send chunk messages with a fixed chunk size
size_t sentLength = 0;
size_t chunkSize = m_chunkSize;
CStopwatch stopwatch;
stopwatch.start();
file.seekg (0, std::ios::beg);
while (true) {
if (stopwatch.getTime() > PAUSE_TIME_HACK) {
// make sure we don't read too much from the mock data.
if (sentLength + chunkSize > size) {
chunkSize = size - sentLength;
@ -79,6 +85,9 @@ CFileChunker::sendFileChunks(char* filename, IEventQueue* events, void* eventTar
if (sentLength == size) {
break;
}
stopwatch.reset();
}
}
// send last message