ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 13:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RethinkDB build fix.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-11-08 19:52:36 -05:00
parent c12b68a6b2
commit ef224c3547
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/RethinkDB.hpp
View File

@ -45,6 +45,11 @@ public:
virtual void nodeIsOnline(const uint64_t networkId,const uint64_t memberId); virtual void nodeIsOnline(const uint64_t networkId,const uint64_t memberId);
protected: protected:
struct _PairHasher
{
inline std::size_t operator()(const std::pair<uint64_t,uint64_t> &p) const { return (std::size_t)(p.first ^ p.second); }
};
std::string _host; std::string _host;
std::string _db; std::string _db;
std::string _auth; std::string _auth;
@ -58,7 +63,7 @@ protected:
BlockingQueue< nlohmann::json * > _commitQueue; BlockingQueue< nlohmann::json * > _commitQueue;
std::thread _commitThread[ZT_CONTROLLER_RETHINKDB_COMMIT_THREADS]; std::thread _commitThread[ZT_CONTROLLER_RETHINKDB_COMMIT_THREADS];
std::unordered_map< std::pair<uint64_t,uint64_t>,int64_t > _lastOnline; std::unordered_map< std::pair<uint64_t,uint64_t>,int64_t,_PairHasher > _lastOnline;
mutable std::mutex _lastOnline_l; mutable std::mutex _lastOnline_l;
std::thread _onlineNotificationThread; std::thread _onlineNotificationThread;

2
make-linux.mk
View File

@ -268,7 +268,7 @@ official-static: FORCE
central-controller: FORCE central-controller: FORCE
cd ext/librethinkdbxx ; make cd ext/librethinkdbxx ; make
make -j4 LDLIBS="ext/librethinkdbxx/build/librethinkdb++.a" DEFS="-DZT_CONTROLLER_USE_RETHINKDB" one make LDLIBS="ext/librethinkdbxx/build/librethinkdb++.a" DEFS="-DZT_CONTROLLER_USE_RETHINKDB" one
debug: FORCE debug: FORCE
make ZT_DEBUG=1 one make ZT_DEBUG=1 one