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

Refined file transfer log output

This commit is contained in:
Jerry (Xinyu Hou) 2016-07-08 02:05:54 -07:00
parent 30fa5223bc
commit 9caa04237c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/synergy/FileChunk.cpp
View File

@ -90,7 +90,7 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe
stopwatch.reset(); stopwatch.reset();
if (CLOG->getFilter() >= kDEBUG2) { if (CLOG->getFilter() >= kDEBUG2) {
LOG((CLOG_DEBUG2 "recv file data from client: file size=%s", content.c_str())); LOG((CLOG_DEBUG2 "recv file size=%s", content.c_str()));
stopwatch.start(); stopwatch.start();
} }
return kStart; return kStart;
@ -98,13 +98,13 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe
case kDataChunk: case kDataChunk:
dataReceived.append(content); dataReceived.append(content);
if (CLOG->getFilter() >= kDEBUG2) { if (CLOG->getFilter() >= kDEBUG2) {
LOG((CLOG_DEBUG2 "recv file data from client: chunck size=%i", content.size())); LOG((CLOG_DEBUG2 "recv file chunck size=%i", content.size()));
double interval = stopwatch.getTime(); double interval = stopwatch.getTime();
receivedDataSize += content.size(); receivedDataSize += content.size();
LOG((CLOG_DEBUG2 "recv file data from client: interval=%f s", interval)); LOG((CLOG_DEBUG2 "recv file interval=%f s", interval));
if (interval >= kIntervalThreshold) { if (interval >= kIntervalThreshold) {
double averageSpeed = receivedDataSize / interval / 1000; double averageSpeed = receivedDataSize / interval / 1000;
LOG((CLOG_DEBUG2 "recv file data from client: average speed=%f kb/s", averageSpeed)); LOG((CLOG_DEBUG2 "recv file average speed=%f kb/s", averageSpeed));
receivedDataSize = 0; receivedDataSize = 0;
elapsedTime += interval; elapsedTime += interval;
@ -120,12 +120,12 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe
} }
if (CLOG->getFilter() >= kDEBUG2) { if (CLOG->getFilter() >= kDEBUG2) {
LOG((CLOG_DEBUG2 "file data transfer finished")); LOG((CLOG_DEBUG2 "file transfer finished"));
elapsedTime += stopwatch.getTime(); elapsedTime += stopwatch.getTime();
double averageSpeed = expectedSize / elapsedTime / 1000; double averageSpeed = expectedSize / elapsedTime / 1000;
LOG((CLOG_DEBUG2 "file data transfer finished: total time consumed=%f s", elapsedTime)); LOG((CLOG_DEBUG2 "file transfer finished: total time consumed=%f s", elapsedTime));
LOG((CLOG_DEBUG2 "file data transfer finished: total data received=%i kb", expectedSize / 1000)); LOG((CLOG_DEBUG2 "file transfer finished: total data received=%i kb", expectedSize / 1000));
LOG((CLOG_DEBUG2 "file data transfer finished: total average speed=%f kb/s", averageSpeed)); LOG((CLOG_DEBUG2 "file transfer finished: total average speed=%f kb/s", averageSpeed));
} }
return kFinish; return kFinish;
} }