Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dispatcher: Don't call Storage::GetInstance() internally.

Browse Source 
This makes it difficult to test.  Instead, store reference as member variable,
and populate it at constuction (with an alternate constructor available for
test purposes).
This commit is contained in:
Peter Johnson
2015-08-01 11:15:04 -07:00
parent 11508b77d1
commit b5274a495e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Dispatcher.cpp
View File

@@ -18,8 +18,9 @@ using namespace nt;
ATOMIC_STATIC_INIT(Dispatcher)
Dispatcher::Dispatcher()
: m_server(false),
Dispatcher::Dispatcher(Storage& storage)
: m_storage(storage),
m_server(false),
m_do_flush(false),
m_reconnect_proto_rev(0x0300),
m_do_reconnect(true) {
@@ -40,8 +41,8 @@ void Dispatcher::StartServer(const char* listen_address, unsigned int port) {
m_server = true;
using namespace std::placeholders;
Storage::GetInstance().SetOutgoing(
std::bind(&Dispatcher::QueueOutgoing, this, _1, _2, _3), m_server);
m_storage.SetOutgoing(std::bind(&Dispatcher::QueueOutgoing, this, _1, _2, _3),
m_server);
m_dispatch_thread = std::thread(&Dispatcher::DispatchThreadMain, this);
m_clientserver_thread =
@@ -57,8 +58,8 @@ void Dispatcher::StartClient(const char* server_name, unsigned int port) {
m_server = false;
using namespace std::placeholders;
Storage::GetInstance().SetOutgoing(
std::bind(&Dispatcher::QueueOutgoing, this, _1, _2, _3), m_server);
m_storage.SetOutgoing(std::bind(&Dispatcher::QueueOutgoing, this, _1, _2, _3),
m_server);
m_dispatch_thread = std::thread(&Dispatcher::DispatchThreadMain, this);
m_clientserver_thread =
@@ -206,12 +207,11 @@ void Dispatcher::ServerThreadMain(const char* listen_address,
// add to connections list
using namespace std::placeholders;
Storage& storage = Storage::GetInstance();
std::unique_ptr<NetworkConnection> conn_unique(new NetworkConnection(
std::move(stream),
std::bind(&Dispatcher::ServerHandshake, this, _1, _2, _3),
std::bind(&Storage::GetEntryType, &storage, _1),
std::bind(&Storage::ProcessIncoming, &storage, _1, _2)));
std::bind(&Storage::GetEntryType, &m_storage, _1),
std::bind(&Storage::ProcessIncoming, &m_storage, _1, _2)));
auto conn = conn_unique.get();
{
std::lock_guard<std::mutex> lock(m_user_mutex);
@@ -234,12 +234,11 @@ void Dispatcher::ClientThreadMain(const char* server_name, unsigned int port) {
std::unique_lock<std::mutex> lock(m_user_mutex);
using namespace std::placeholders;
Storage& storage = Storage::GetInstance();
std::unique_ptr<NetworkConnection> conn_unique(new NetworkConnection(
std::move(stream),
std::bind(&Dispatcher::ClientHandshake, this, _1, _2, _3),
std::bind(&Storage::GetEntryType, &storage, _1),
std::bind(&Storage::ProcessIncoming, &storage, _1, _2)));
std::bind(&Storage::GetEntryType, &m_storage, _1),
std::bind(&Storage::ProcessIncoming, &m_storage, _1, _2)));
auto conn = conn_unique.get();
m_connections.resize(0); // disconnect any current
m_connections.emplace_back(std::move(conn_unique));
@@ -312,8 +311,7 @@ bool Dispatcher::ClientHandshake(
// generate outgoing assignments
NetworkConnection::Outgoing outgoing;
Storage::GetInstance().ApplyInitialAssignments(conn, incoming, new_server,
&outgoing);
m_storage.ApplyInitialAssignments(conn, incoming, new_server, &outgoing);
if (conn.proto_rev() >= 0x0300)
outgoing.emplace_back(Message::ClientHelloDone());
@@ -363,7 +361,7 @@ bool Dispatcher::ServerHandshake(
}
// Get snapshot of initial assignments
Storage::GetInstance().GetInitialAssignments(conn, &outgoing);
m_storage.GetInitialAssignments(conn, &outgoing);
// Finish with server hello done
outgoing.emplace_back(Message::ServerHelloDone());
@@ -396,8 +394,7 @@ bool Dispatcher::ServerHandshake(
// get the next message (blocks)
msg = get_msg();
}
Storage& storage = Storage::GetInstance();
for (auto& msg : incoming) storage.ProcessIncoming(msg, &conn);
for (auto& msg : incoming) m_storage.ProcessIncoming(msg, &conn);
}
INFO("server: client CONNECTED: " << conn.stream().getPeerIP() << " port "