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

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-19 16:49:38 +00:00
parent 06a9c2197c
commit d8b8487dd7
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src_main/io/pipeer.cpp
View File

@@ -447,7 +447,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
ba >> type; ba >> type;
// PIMutexLocker locker(eth_mutex); // PIMutexLocker locker(eth_mutex);
eth_mutex.lock(); eth_mutex.lock();
piCout << "dataRead lock"; // piCout << "dataRead lock";
if (type == 5) { // ping request if (type == 5) { // ping request
PIString addr; PIString addr;
PISystemTime time; PISystemTime time;
@@ -717,7 +717,7 @@ bool PIPeer::sendToNeighbour(PIPeer::PeerInfo * peer, const PIByteArray & ba) {
void PIPeer::sendMBcast(const PIByteArray & ba) { void PIPeer::sendMBcast(const PIByteArray & ba) {
send_mc_mutex.lock(); send_mc_mutex.lock();
piCout << "sendMBcast" << ba.size() << "bytes ..."; // piCout << "sendMBcast" << ba.size() << "bytes ...";
piForeach (PIEthernet * e, eths_mcast) { piForeach (PIEthernet * e, eths_mcast) {
//errorClear(); //errorClear();
//piCout << "send to" << e->path() << e->sendAddress();// << e->send(ba); //piCout << "send to" << e->path() << e->sendAddress();// << e->send(ba);
@@ -749,7 +749,7 @@ void PIPeer::sendMBcast(const PIByteArray & ba) {
if (eth_tcp_cli.send(ba)) if (eth_tcp_cli.send(ba))
diag_s.sended(ba.size_s()); diag_s.sended(ba.size_s());
} }
piCout << "sendMBcast ok"; // piCout << "sendMBcast ok";
send_mc_mutex.unlock(); send_mc_mutex.unlock();
} }
@@ -852,7 +852,7 @@ bool PIPeer::closeDevice() {
void PIPeer::syncPeers() { void PIPeer::syncPeers() {
//piCout << "[PIPeer \"" + self_info.name + "\"] sync " << peers.size_s() << " peers"; //piCout << "[PIPeer \"" + self_info.name + "\"] sync " << peers.size_s() << " peers";
PIMutexLocker locker(eth_mutex); PIMutexLocker locker(eth_mutex);
piCout << "syncPeers lock"; // piCout << "syncPeers lock";
PIString pn; PIString pn;
bool change = false; bool change = false;
PIStringList dpeers; PIStringList dpeers;
@@ -908,7 +908,7 @@ void PIPeer::reinit() {
// timer.clearDelimiters(); // timer.clearDelimiters();
PIMutexLocker mbl(mc_mutex); PIMutexLocker mbl(mc_mutex);
PIMutexLocker ethl(eth_mutex); PIMutexLocker ethl(eth_mutex);
piCout << "reinit lock"; // piCout << "reinit lock";
PIMutexLocker pl(peers_mutex); PIMutexLocker pl(peers_mutex);
PIMutexLocker sl(send_mutex); PIMutexLocker sl(send_mutex);
initNetwork(); initNetwork();

12
utils/system_daemon/daemon.cpp
View File

@@ -623,8 +623,8 @@ void Daemon::peerConnected(const PIString & p_name) {
// piCout << r->methodsEH() << this->methodsEH(); // piCout << r->methodsEH() << this->methodsEH();
CONNECTU(r, sendRequest, this, sendRequest) CONNECTU(r, sendRequest, this, sendRequest)
CONNECTU(r, receiveFinished, this, filesReceived) CONNECTU(r, receiveFinished, this, filesReceived)
CONNECTU(r, receiveFinished, this, closeFileDialog) //CONNECTU(r, receiveFinished, this, closeFileDialog)
CONNECTU(r, sendFinished, this, closeFileDialog) CONNECTU(r, sendFinished, this, filesSended)
CONNECTU(r, changeDirFinished, this, dirChanged) CONNECTU(r, changeDirFinished, this, dirChanged)
PIMutexLocker ml2(remote_mutex); PIMutexLocker ml2(remote_mutex);
remotes.insert(p_name, r); remotes.insert(p_name, r);
@@ -650,6 +650,8 @@ void Daemon::peerDisconnected(const PIString & p_name) {
void Daemon::filesReceived(const PIString & p_name, bool ok) { void Daemon::filesReceived(const PIString & p_name, bool ok) {
piCoutObj << "filesReceived";
closeFileDialog(p_name, ok);
PIMutexLocker ml(remote_mutex); PIMutexLocker ml(remote_mutex);
Remote * r = remotes.value(p_name, 0); Remote * r = remotes.value(p_name, 0);
if (!r) return; if (!r) return;
@@ -657,6 +659,12 @@ void Daemon::filesReceived(const PIString & p_name, bool ok) {
} }
void Daemon::filesSended(const PIString & p_name, bool ok) {
piCoutObj << "filesSended";
closeFileDialog(p_name, ok);
}
void Daemon::dirChanged(const PIString & p_name, const PIString & dir) { void Daemon::dirChanged(const PIString & p_name, const PIString & dir) {
if (p_name == self_name) { if (p_name == self_name) {
fm.clearSelectionLocal(); fm.clearSelectionLocal();

1
utils/system_daemon/daemon.h
View File

@@ -163,6 +163,7 @@ private:
EVENT_HANDLER1(void, shKeyEvent, PIKbdListener::KeyEvent, k); EVENT_HANDLER1(void, shKeyEvent, PIKbdListener::KeyEvent, k);
EVENT_HANDLER2(void, timerEvent, void * , _d, int, delim); EVENT_HANDLER2(void, timerEvent, void * , _d, int, delim);
EVENT_HANDLER2(void, filesReceived, const PIString & , p_name, bool, ok); EVENT_HANDLER2(void, filesReceived, const PIString & , p_name, bool, ok);
EVENT_HANDLER2(void, filesSended, const PIString & , p_name, bool, ok);
EVENT_HANDLER2(void, dirChanged, const PIString & , p_name, const PIString & , dir); EVENT_HANDLER2(void, dirChanged, const PIString & , p_name, const PIString & , dir);
EVENT_HANDLER2(void, closeFileDialog, const PIString & , p_name, bool, ok); EVENT_HANDLER2(void, closeFileDialog, const PIString & , p_name, bool, ok);
EVENT_HANDLER2(void, localSend, const PIString & , p_name, const PIByteArray &, data); EVENT_HANDLER2(void, localSend, const PIString & , p_name, const PIByteArray &, data);