SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@406 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-19 14:53:31 +00:00
parent 01c5327dd2
commit 4106e52cd7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src_main/io/pibasetransfer.cpp
View File

@@ -13,7 +13,7 @@ PIBaseTransfer::PIBaseTransfer(): crc(standardCRC_16()), diag(false) {
bytes_all = bytes_cur = 0; bytes_all = bytes_cur = 0;
send_queue = 0; send_queue = 0;
timeout_ = 10.; timeout_ = 10.;
diag.setDisconnectTimeout(timeout_); diag.setDisconnectTimeout(timeout_ / 10);
//CONNECTU(&diag, qualityChanged, this, diagChanged); //CONNECTU(&diag, qualityChanged, this, diagChanged);
diag.setName("PIBaseTransfer"); diag.setName("PIBaseTransfer");
diag.start(50); diag.start(50);
@@ -529,13 +529,13 @@ bool PIBaseTransfer::finish_send(bool ok) {
is_sending = false; is_sending = false;
if (ok) state_string = "send done"; if (ok) state_string = "send done";
else state_string = "send failed"; else state_string = "send failed";
//piCoutObj << state_string << PIString::readableSize(bytes_all);
mutex_header.lock(); mutex_header.lock();
header.id = 0; header.id = 0;
if (!ok) sendBreak(header.session_id); if (!ok) sendBreak(header.session_id);
else sendReply(pt_ReplySuccess); else sendReply(pt_ReplySuccess);
mutex_header.unlock(); mutex_header.unlock();
sendFinished(ok); sendFinished(ok);
piCoutObj << state_string << PIString::readableSize(bytes_all);
// diag.stop(); // diag.stop();
bytes_all = bytes_cur = 0; bytes_all = bytes_cur = 0;
return ok; return ok;
@@ -546,13 +546,13 @@ void PIBaseTransfer::finish_receive(bool ok, bool quet) {
is_receiving = false; is_receiving = false;
if (ok) state_string = "receive done"; if (ok) state_string = "receive done";
else state_string = "receive failed"; else state_string = "receive failed";
//piCoutObj << state_string << PIString::readableSize(bytes_all);
if (!ok && !quet) { if (!ok && !quet) {
mutex_header.lock(); mutex_header.lock();
sendBreak(header.session_id); sendBreak(header.session_id);
mutex_header.unlock(); mutex_header.unlock();
} }
receiveFinished(ok); receiveFinished(ok);
piCoutObj << state_string << PIString::readableSize(bytes_all);
// diag.stop(); // diag.stop();
bytes_all = bytes_cur = 0; bytes_all = bytes_cur = 0;
} }