Fix a possible excessive memory use issue in controller and clean up a bunch of COM handling and other code in the normal node.

This commit is contained in:
Adam Ierymenko 2022-04-19 19:59:54 -04:00
parent fe0068da52
commit ef08346a74
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
8 changed files with 17 additions and 18 deletions

View file

@ -117,6 +117,7 @@ private:
uint64_t networkId;
uint64_t nodeId;
inline bool operator==(const _MemberStatusKey &k) const { return ((k.networkId == networkId)&&(k.nodeId == nodeId)); }
inline bool operator<(const _MemberStatusKey &k) const { return (k.networkId < networkId) || ((k.networkId == networkId)&&(k.nodeId < nodeId)); }
};
struct _MemberStatus
{
@ -154,7 +155,7 @@ private:
std::unordered_map< _MemberStatusKey,_MemberStatus,_MemberStatusHash > _memberStatus;
std::mutex _memberStatus_l;
std::multimap< int64_t, _MemberStatusKey > _expiringSoon;
std::set< std::pair<int64_t, _MemberStatusKey> > _expiringSoon;
std::mutex _expiringSoon_l;
RedisConfig *_rc;