diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-24 19:16:36 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-24 19:16:36 -0700 |
| commit | cafbe44dde55e57115cc654610172556dff19bec (patch) | |
| tree | 3e6e22d491535e16e97c94388b7ec02e3b7f0c2a /controller/EmbeddedNetworkController.hpp | |
| parent | 6234bfd8bf47ad3fc1f5b87adea73c62839f2864 (diff) | |
| download | infinitytier-cafbe44dde55e57115cc654610172556dff19bec.tar.gz infinitytier-cafbe44dde55e57115cc654610172556dff19bec.zip | |
Controller optimizations -- make locking more fine-grained, use true hardware concurrency, etc.
Diffstat (limited to 'controller/EmbeddedNetworkController.hpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.hpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp index 0ae2f3b5..906f4345 100644 --- a/controller/EmbeddedNetworkController.hpp +++ b/controller/EmbeddedNetworkController.hpp @@ -43,9 +43,6 @@ #include "JSONDB.hpp" -// Number of background threads to start -- not actually started until needed -#define ZT_EMBEDDEDNETWORKCONTROLLER_BACKGROUND_THREAD_COUNT 4 - // TTL for circuit tests #define ZT_EMBEDDEDNETWORKCONTROLLER_CIRCUIT_TEST_EXPIRATION 120000 @@ -182,15 +179,13 @@ private: const uint64_t _startTime; BlockingQueue<_RQEntry *> _queue; - Thread _threads[ZT_EMBEDDEDNETWORKCONTROLLER_BACKGROUND_THREAD_COUNT]; - bool _threadsStarted; + std::vector<Thread> _threads; Mutex _threads_m; std::map<uint64_t,_NetworkMemberInfo> _nmiCache; Mutex _nmiCache_m; JSONDB _db; - Mutex _db_m; Node *const _node; std::string _path; |