summaryrefslogtreecommitdiff
path: root/controller
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-10-13 13:52:45 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-10-13 13:52:45 -0700
commit2d6a4e5974430ea01cf424aab8b372ebc872b25f (patch)
treec88d3be88a69bc1c9448e4bde6330ed34c808374 /controller
parent93b4ac5cb28408d4bcb63433d9f93a6efe188319 (diff)
downloadinfinitytier-2d6a4e5974430ea01cf424aab8b372ebc872b25f.tar.gz
infinitytier-2d6a4e5974430ea01cf424aab8b372ebc872b25f.zip
cleanup
Diffstat (limited to 'controller')
-rw-r--r--controller/EmbeddedNetworkController.cpp22
-rw-r--r--controller/EmbeddedNetworkController.hpp12
2 files changed, 0 insertions, 34 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index 7559cf83..2c43d4b5 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -517,19 +517,6 @@ void EmbeddedNetworkController::threadMain()
lastUpdatedNetworkMemberCache = OSUtils::now();
}
- { // Every 25ms we push up to 50 network refreshes, which amounts to a max of about 300-500kb/sec
- unsigned int count = 0;
- Mutex::Lock _l(_refreshQueue_m);
- while (_refreshQueue.size() > 0) {
- _Refresh &r = _refreshQueue.front();
- //if (_node)
- // _node->pushNetworkRefresh(r.dest,r.nwid,r.blacklistAddresses,r.blacklistThresholds,r.numBlacklistEntries);
- _refreshQueue.pop_front();
- if (++count >= 50)
- break;
- }
- }
-
Thread::sleep(25);
}
}
@@ -1230,15 +1217,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
_networkMemberCache[nwid][Address(address)] = member;
}
- {
- Mutex::Lock _l(_refreshQueue_m);
- _refreshQueue.push_back(_Refresh());
- _Refresh &r = _refreshQueue.back();
- r.dest = Address(address);
- r.nwid = nwid;
- r.numBlacklistEntries = 0;
- }
-
// Add non-persisted fields
member["clock"] = now;
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
index 1e0fa576..99e1836d 100644
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@@ -204,18 +204,6 @@ private:
std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime;
Mutex _lastRequestTime_m;
- // Queue of network member refreshes to be pushed
- struct _Refresh
- {
- Address dest;
- uint64_t nwid;
- uint64_t blacklistAddresses[64];
- uint64_t blacklistThresholds[64];
- unsigned int numBlacklistEntries;
- };
- std::list< _Refresh > _refreshQueue;
- Mutex _refreshQueue_m;
-
Thread _daemon;
volatile bool _daemonRun;
};