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

replace _networks map by vector

Browse source 
_networks is usually quite small, using binary search on a vector might be faster comapred to std::map.
This is especially true when using uClibc++, which uses a list.
This commit is contained in:
Moritz Warning 2015-06-20 09:36:51 +02:00
parent bd7e4ab695
commit 2b04ac5e9b
2 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
node/Node.hpp
View file

@ -155,19 +155,21 @@ public:
len);
}
inline SharedPtr<Network> network(uint64_t nwid)
inline SharedPtr<Network> network(uint64_t nwid) const
{
Mutex::Lock _l(_networks_m);
std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid));
return ((nw == _networks.end()) ? SharedPtr<Network>() : nw->second);
std::vector< SharedPtr<Network> >::const_iterator iter = std::lower_bound(_networks.begin(), _networks.end(), nwid, NetworkComparator());
if(iter != _networks.end() && (*iter)->id() == nwid) {
return *iter;
} else {
return SharedPtr<Network>();
}
}
inline std::vector< SharedPtr<Network> > allNetworks() const
{
Mutex::Lock _l(_networks_m);
std::vector< SharedPtr<Network> > nw;
for(std::map< uint64_t,SharedPtr<Network> >::const_iterator n(_networks.begin());n!=_networks.end();++n)
nw.push_back(n->second);
std::vector< SharedPtr<Network> > nw(_networks);
return nw;
}
@ -208,6 +210,13 @@ public:
#endif
private:
// for binary search on _networks
struct NetworkComparator {
bool operator()(const SharedPtr<Network> &n,uint64_t nwid) const {
return n->id() < nwid;
}
};
RuntimeEnvironment _RR;
RuntimeEnvironment *RR;
@ -223,7 +232,7 @@ private:
//Dictionary _localConfig; // persisted as local.conf
//Mutex _localConfig_m;
std::map< uint64_t,SharedPtr<Network> > _networks;
std::vector< SharedPtr<Network> > _networks;
Mutex _networks_m;
Mutex _backgroundTasksLock;