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@421 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-20 07:41:48 +00:00
parent fbcda1ce70
commit 6c6159982c
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src_main/io/pibasetransfer.cpp
View File

@@ -545,7 +545,7 @@ bool PIBaseTransfer::finish_send(bool ok) {
if (!ok) sendBreak(header.session_id);
else sendReply(pt_ReplySuccess);
mutex_header.unlock();
piCoutObj << state_string << PIString::readableSize(bytes_all);
//piCoutObj << state_string << PIString::readableSize(bytes_all);
sendFinished(ok);
// diag.stop();
bytes_all = bytes_cur = 0;
@@ -562,7 +562,7 @@ void PIBaseTransfer::finish_receive(bool ok, bool quet) {
sendBreak(header.session_id);
mutex_header.unlock();
}
piCoutObj << state_string << PIString::readableSize(bytes_all);
//piCoutObj << state_string << PIString::readableSize(bytes_all);
receiveFinished(ok);
// diag.stop();
bytes_all = bytes_cur = 0;

2
src_main/system/piprocess.cpp
View File

@@ -172,7 +172,7 @@ void PIProcess::startProc(bool detached) {
//cout << "exec " << tf_in << ", " << tf_out << ", " << tf_err << endl;
if (execve(str.data(), a, e) < 0)
piCoutObj << "\"execve\" error, " << errorString();
piCoutObj << "\"execve\" error in" << str << ":" << errorString();
} else {
msleep(1);
//cout << "wait" << endl;

10
utils/system_daemon/daemon.cpp
View File

@@ -652,22 +652,16 @@ void Daemon::peerDisconnected(const PIString & p_name) {
void Daemon::filesReceived(const PIString & p_name, bool ok) {
piCout << "filesReceived";
piCout << "files received from" << p_name;
closeFileDialog(p_name, ok);
piCout << "filesReceived 1";
//PIMutexLocker ml(remote_mutex);
piCout << "filesReceived 2";
Remote * r = remotes.value(p_name, 0);
piCout << "filesReceived 3";
if (!r) return;
piCout << "filesReceived 4";
r->updateDir();
piCout << "filesReceived 5";
}
void Daemon::filesSended(const PIString & p_name, bool ok) {
piCout << "filesSended";
piCout << "files sended to" << p_name;
closeFileDialog(p_name, ok);
}