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

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-19 14:17:23 +00:00
parent d0f570c929
commit ea76fc84f0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src_main/io/pipeer.cpp
View File

@@ -446,6 +446,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
PIString from, to; PIString from, to;
ba >> type; ba >> type;
PIMutexLocker locker(eth_mutex); PIMutexLocker locker(eth_mutex);
piCout << "dataRead lock";
if (type == 5) { // ping request if (type == 5) { // ping request
PIString addr; PIString addr;
PISystemTime time; PISystemTime time;
@@ -703,7 +704,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();
piCoutObj << "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);
@@ -735,7 +736,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());
} }
piCoutObj << "sendMBcast ok"; piCout << "sendMBcast ok";
send_mc_mutex.unlock(); send_mc_mutex.unlock();
} }
@@ -838,6 +839,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";
PIString pn; PIString pn;
bool change = false; bool change = false;
PIStringList dpeers; PIStringList dpeers;
@@ -893,6 +895,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";
PIMutexLocker pl(peers_mutex); PIMutexLocker pl(peers_mutex);
PIMutexLocker sl(send_mutex); PIMutexLocker sl(send_mutex);
initNetwork(); initNetwork();