github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-08 05:51:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make MulticastTopology have its own mutex.

Browse source
This commit is contained in:
Adam Ierymenko 2014-09-23 10:26:30 -07:00
parent c49e253e21
commit 61d0f27d2a
4 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
node/MulticastTopology.hpp
View file

@ -38,6 +38,7 @@
#include "Address.hpp"
#include "MulticastGroup.hpp"
#include "Utils.hpp"
#include "Mutex.hpp"
namespace ZeroTier {
@ -45,8 +46,6 @@ class Topology;
/**
* Database of known multicast peers within a network
*
* This structure is not guarded by a mutex; the caller must synchronize access.
*/
class MulticastTopology
{
@ -100,6 +99,7 @@ public:
*/
inline std::pair<uint64_t,unsigned int> groupStatus(const MulticastGroup &mg) const
{
Mutex::Lock _l(_groups_m);
std::map< MulticastGroup,MulticastGroupStatus >::const_iterator r(_groups.find(mg));
return ((r != _groups.end()) ? std::pair<uint64_t,unsigned int>(r->second.lastGatheredMembers,r->second.members.size()) : std::pair<uint64_t,unsigned int>(0,0));
}
@ -122,6 +122,7 @@ public:
*/
inline void gatheringMembersNow(const MulticastGroup &mg,uint64_t now)
{
Mutex::Lock _l(_groups_m);
_groups[mg].lastGatheredMembers = now;
}
@ -136,6 +137,7 @@ public:
private:
std::map< MulticastGroup,MulticastGroupStatus > _groups;
Mutex _groups_m;
};
} // namespace ZeroTier