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

20.10.2013 - Modified PIObject - virtual debugName() for macro piCoutObj, improved timer measurements and timers on Windows

Browse Source
This commit is contained in:
peri4
2013-10-20 17:41:55 +04:00
parent 0f1b528ac6
commit ec5530053a
32 changed files with 2196 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pipeer.cpp
View File

@@ -152,8 +152,8 @@ void PIPeer::initMulticasts(const PIStringList & al) {
break;
}
}
if (!rec_mc) piCoutObj << "[PIPeer \"" + name_ + "\"] Can`t find suitable network interface for multicast receive, check for exists at least one interface with multicasting enabled!";
if (!rec_bc) piCoutObj << "[PIPeer \"" + name_ + "\"] Can`t find suitable network interface for broadcast receive, check for exists at least one interface with broadcasting enabled!";
if (!rec_mc) piCoutObj << "Can`t find suitable network interface for multicast receive, check for exists at least one interface with multicasting enabled!";
if (!rec_bc) piCoutObj << "Can`t find suitable network interface for broadcast receive, check for exists at least one interface with broadcasting enabled!";
}
@@ -186,7 +186,7 @@ PIPeer::PeerInfo * PIPeer::quickestPeer(const PIString & to) {
bool PIPeer::send(const PIString & to, const void * data, int size) {
PeerInfo * dp = quickestPeer(to);
if (dp == 0) {
//piCoutObj << "[PIPeer \"" + name_ + "\"] Can`t find peer \"" << to << "\"!";
//piCoutObj << "Can`t find peer \"" << to << "\"!";
return false;
}
PIByteArray ba;
@@ -248,14 +248,14 @@ bool PIPeer::dataRead(uchar * readed, int size) {
}
PeerInfo * dp = quickestPeer(to);
if (dp == 0) {
//piCoutObj << "[PIPeer \"" + name_ + "\"] Can`t find peer \"" << to << "\"!";
//piCoutObj << "Can`t find peer \"" << to << "\"!";
return true;
}
cnt++;
if (cnt > 100 || from == dp->name) return true;
sba << type << from << to << cnt << rec_size;
sba.append(ba);
//piCoutObj << "[PIPeer \"" + name_ + "\"] Translate data packet" << type << from << to << cnt << rec_size;
//piCoutObj << "Translate data packet" << type << from << to << cnt << rec_size;
sendToNeighbour(dp, sba);
}
return true;
@@ -287,7 +287,7 @@ bool PIPeer::multicastRead(uchar * data, int size) {
self_info.addNeighbour(pi.name);
}
peers << pi;
//piCoutObj << "[PIPeer \"" + name_ + "\"] new peer \"" << pi.name << "\"" << " dist " << pi.dist;
//piCoutObj << "new peer \"" << pi.name << "\"" << " dist " << pi.dist;
pi.dist++;
sendSelfInfo();
sendPeerInfo(pi);
@@ -299,7 +299,7 @@ bool PIPeer::multicastRead(uchar * data, int size) {
case 2: // remove peer accepted
//piCout << "remove peer packet ...";
if (removePeer(pi.name)) {
//piCoutObj << "[PIPeer \"" + name_ + "\"] remove peer \"" << pi.name << "\"";
//piCoutObj << "remove peer \"" << pi.name << "\"";
if (pi.dist == 0) {
pi.removeNeighbour(self_info.name);
self_info.removeNeighbour(pi.name);
@@ -325,8 +325,8 @@ bool PIPeer::multicastRead(uchar * data, int size) {
PeerInfo & peer(peers[j]);
if (peer.name == rpeer.name) {
//piCout << "synced " << peer.name;
peer.addresses == rpeer.addresses;
peer.netmasks == rpeer.netmasks;
peer.addresses = rpeer.addresses;
peer.netmasks = rpeer.netmasks;
peer.addNeighbours(rpeer.neighbours);
rpeer.neighbours = peer.neighbours;
if (peer.name == pi.name) peer.sync = 0;
@@ -406,7 +406,7 @@ void PIPeer::syncPeers() {
PeerInfo & cp(peers[i]);
if (cp.sync > 3 && cp.dist == 0) {
pn = cp.name;
//piCoutObj << "[PIPeer \"" + name_ + "\"] sync: remove " << pn;
//piCoutObj << "sync: remove " << pn;
peers.remove(i);
sendPeerRemove(pn);
--i;