From cafbe44dde55e57115cc654610172556dff19bec Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 24 Apr 2017 19:16:36 -0700 Subject: Controller optimizations -- make locking more fine-grained, use true hardware concurrency, etc. --- controller/EmbeddedNetworkController.hpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'controller/EmbeddedNetworkController.hpp') 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 _threads; Mutex _threads_m; std::map _nmiCache; Mutex _nmiCache_m; JSONDB _db; - Mutex _db_m; Node *const _node; std::string _path; -- cgit v1.2.3