dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parallelization improvements

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-12 08:20:38 -07:00
parent 44878e583a
commit 99c36ed2f2
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

56
root/root.cpp
View file

@ -97,6 +97,7 @@
#include <vector> #include <vector>
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>
#include <list>
#include <sstream> #include <sstream>
#include "geoip-html.h" #include "geoip-html.h"
@ -195,6 +196,7 @@ static Meter s_forwardRate;
static Meter s_discardedForwardRate; static Meter s_discardedForwardRate;
static std::string s_planet; static std::string s_planet;
static std::list< SharedPtr<RootPeer> > s_peers;
static std::unordered_map< uint64_t,std::unordered_map< MulticastGroup,std::unordered_map< Address,int64_t,AddressHasher >,MulticastGroupHasher > > s_multicastSubscriptions; static std::unordered_map< uint64_t,std::unordered_map< MulticastGroup,std::unordered_map< Address,int64_t,AddressHasher >,MulticastGroupHasher > > s_multicastSubscriptions;
static std::unordered_map< Identity,SharedPtr<RootPeer>,IdentityHasher > s_peersByIdentity; static std::unordered_map< Identity,SharedPtr<RootPeer>,IdentityHasher > s_peersByIdentity;
static std::unordered_map< Address,std::set< SharedPtr<RootPeer> >,AddressHasher > s_peersByVirtAddr; static std::unordered_map< Address,std::set< SharedPtr<RootPeer> >,AddressHasher > s_peersByVirtAddr;
@ -205,7 +207,7 @@ static std::map< std::pair< uint32_t,uint32_t >,std::pair< float,float > > s_geo
static std::map< std::pair< std::array< uint64_t,2 >,std::array< uint64_t,2 > >,std::pair< float,float > > s_geoIp6; static std::map< std::pair< std::array< uint64_t,2 >,std::array< uint64_t,2 > >,std::pair< float,float > > s_geoIp6;
static std::mutex s_planet_l; static std::mutex s_planet_l;
static std::mutex s_siblings_l; static std::mutex s_peers_l;
static std::mutex s_multicastSubscriptions_l; static std::mutex s_multicastSubscriptions_l;
static std::mutex s_peersByIdentity_l; static std::mutex s_peersByIdentity_l;
static std::mutex s_peersByVirtAddr_l; static std::mutex s_peersByVirtAddr_l;
@ -246,12 +248,10 @@ static void handlePacket(const int v4s,const int v6s,const InetAddress *const ip
// If this is an un-encrypted HELLO, either learn a new peer or verify // If this is an un-encrypted HELLO, either learn a new peer or verify
// that this is a peer we already know. // that this is a peer we already know.
if ((pkt.cipher() == ZT_PROTO_CIPHER_SUITE__POLY1305_NONE)&&(pkt.verb() == Packet::VERB_HELLO)) { if ((pkt.cipher() == ZT_PROTO_CIPHER_SUITE__POLY1305_NONE)&&(pkt.verb() == Packet::VERB_HELLO)) {
std::lock_guard<std::mutex> pbi_l(s_peersByIdentity_l);
std::lock_guard<std::mutex> pbv_l(s_peersByVirtAddr_l);
Identity id; Identity id;
if (id.deserialize(pkt,ZT_PROTO_VERB_HELLO_IDX_IDENTITY)) { if (id.deserialize(pkt,ZT_PROTO_VERB_HELLO_IDX_IDENTITY)) {
{ {
std::lock_guard<std::mutex> pbi_l(s_peersByIdentity_l);
auto pById = s_peersByIdentity.find(id); auto pById = s_peersByIdentity.find(id);
if (pById != s_peersByIdentity.end()) { if (pById != s_peersByIdentity.end()) {
peer = pById->second; peer = pById->second;
@ -273,8 +273,14 @@ static void handlePacket(const int v4s,const int v6s,const InetAddress *const ip
} }
peer->id = id; peer->id = id;
peer->lastReceive = now; peer->lastReceive = now;
s_peersByIdentity.emplace(id,peer); std::lock_guard<std::mutex> pl(s_peers_l);
s_peersByVirtAddr[id.address()].emplace(peer); std::lock_guard<std::mutex> pbi_l(s_peersByIdentity_l);
std::lock_guard<std::mutex> pbv_l(s_peersByVirtAddr_l);
if (s_peersByIdentity.find(id) == s_peersByIdentity.end()) { // double check to ensure another thread didn't add this
s_peers.emplace_back(peer);
s_peersByIdentity.emplace(id,peer);
s_peersByVirtAddr[id.address()].emplace(peer);
}
} else { } else {
printf("%s HELLO rejected: packet authentication failed" ZT_EOL_S,ip->toString(ipstr)); printf("%s HELLO rejected: packet authentication failed" ZT_EOL_S,ip->toString(ipstr));
return; return;
@ -1117,37 +1123,41 @@ int main(int argc,char **argv)
// Remove expired peers // Remove expired peers
{ {
std::lock_guard<std::mutex> pbi_l(s_peersByIdentity_l); std::lock_guard<std::mutex> pbi_l(s_peers_l);
for(auto p=s_peersByIdentity.begin();p!=s_peersByIdentity.end();) { for(auto p=s_peers.begin();p!=s_peers.end();) {
if ((now - p->second->lastReceive) > ZT_PEER_ACTIVITY_TIMEOUT) { if ((now - (*p)->lastReceive) > ZT_PEER_ACTIVITY_TIMEOUT) {
std::lock_guard<std::mutex> pbi_l(s_peersByIdentity_l);
std::lock_guard<std::mutex> pbv_l(s_peersByVirtAddr_l); std::lock_guard<std::mutex> pbv_l(s_peersByVirtAddr_l);
std::lock_guard<std::mutex> pbp_l(s_peersByPhysAddr_l); std::lock_guard<std::mutex> pbp_l(s_peersByPhysAddr_l);
auto pbv = s_peersByVirtAddr.find(p->second->id.address()); s_peersByIdentity.erase((*p)->id);
auto pbv = s_peersByVirtAddr.find((*p)->id.address());
if (pbv != s_peersByVirtAddr.end()) { if (pbv != s_peersByVirtAddr.end()) {
pbv->second.erase(p->second); pbv->second.erase((*p));
if (pbv->second.empty()) if (pbv->second.empty())
s_peersByVirtAddr.erase(pbv); s_peersByVirtAddr.erase(pbv);
} }
if (p->second->ip4) { if ((*p)->ip4) {
auto pbp = s_peersByPhysAddr.find(p->second->ip4); auto pbp = s_peersByPhysAddr.find((*p)->ip4);
if (pbp != s_peersByPhysAddr.end()) { if (pbp != s_peersByPhysAddr.end()) {
pbp->second.erase(p->second); pbp->second.erase((*p));
if (pbp->second.empty())
s_peersByPhysAddr.erase(pbp);
}
}
if (p->second->ip6) {
auto pbp = s_peersByPhysAddr.find(p->second->ip6);
if (pbp != s_peersByPhysAddr.end()) {
pbp->second.erase(p->second);
if (pbp->second.empty()) if (pbp->second.empty())
s_peersByPhysAddr.erase(pbp); s_peersByPhysAddr.erase(pbp);
} }
} }
s_peersByIdentity.erase(p++); if ((*p)->ip6) {
auto pbp = s_peersByPhysAddr.find((*p)->ip6);
if (pbp != s_peersByPhysAddr.end()) {
pbp->second.erase((*p));
if (pbp->second.empty())
s_peersByPhysAddr.erase(pbp);
}
}
s_peers.erase(p++);
} else ++p; } else ++p;
} }
} }