jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass SonarState into SonarWebSocketImpl

Browse Source 
Summary: Allowing the connection code to update trigger diagnostic events

Reviewed By: passy

Differential Revision: D9117507

fbshipit-source-id: 24eeb1f80109f89137a7333e04039c3ae9dc3e71
This commit is contained in:
John Knox
2018-08-03 07:34:42 -07:00
committed by Facebook Github Bot
parent 3237b60ff1
commit c7858c62f7
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xplat/Sonar/SonarClient.cpp
View File

@@ -31,8 +31,9 @@ static SonarClient* kInstance;
using folly::dynamic; using folly::dynamic;
void SonarClient::init(SonarInitConfig config) { void SonarClient::init(SonarInitConfig config) {
auto state = std::make_shared<SonarState>();
kInstance = kInstance =
new SonarClient(std::make_unique<SonarWebSocketImpl>(std::move(config))); new SonarClient(std::make_unique<SonarWebSocketImpl>(std::move(config), state), state);
} }
SonarClient* SonarClient::instance() { SonarClient* SonarClient::instance() {

7
xplat/Sonar/SonarClient.h
View File

@@ -39,9 +39,8 @@ class SonarClient : public SonarWebSocket::Callbacks {
/** /**
Only public for testing Only public for testing
*/ */
SonarClient(std::unique_ptr<SonarWebSocket> socket) SonarClient(std::unique_ptr<SonarWebSocket> socket, std::shared_ptr<SonarState> state)
: socket_(std::move(socket)) { : socket_(std::move(socket)), sonarState_(state) {
sonarState_ = std::make_unique<SonarState>();
auto step = sonarState_->start("Create client"); auto step = sonarState_->start("Create client");
socket_->setCallbacks(this); socket_->setCallbacks(this);
step->complete(); step->complete();
@@ -92,7 +91,7 @@ class SonarClient : public SonarWebSocket::Callbacks {
std::map<std::string, std::shared_ptr<SonarPlugin>> plugins_; std::map<std::string, std::shared_ptr<SonarPlugin>> plugins_;
std::map<std::string, std::shared_ptr<SonarConnectionImpl>> connections_; std::map<std::string, std::shared_ptr<SonarConnectionImpl>> connections_;
std::mutex mutex_; std::mutex mutex_;
std::unique_ptr<SonarState> sonarState_; std::shared_ptr<SonarState> sonarState_;
void performAndReportError(const std::function<void()>& func); void performAndReportError(const std::function<void()>& func);
void disconnect(std::shared_ptr<SonarPlugin> plugin); void disconnect(std::shared_ptr<SonarPlugin> plugin);

4
xplat/Sonar/SonarWebSocketImpl.cpp
View File

@@ -91,8 +91,8 @@ class Responder : public rsocket::RSocketResponder {
} }
}; };
SonarWebSocketImpl::SonarWebSocketImpl(SonarInitConfig config) SonarWebSocketImpl::SonarWebSocketImpl(SonarInitConfig config, std::shared_ptr<SonarState> state)
: deviceData_(config.deviceData), sonarEventBase_(config.callbackWorker), connectionEventBase_(config.connectionWorker) {} : deviceData_(config.deviceData), sonarState_(state), sonarEventBase_(config.callbackWorker), connectionEventBase_(config.connectionWorker) {}
SonarWebSocketImpl::~SonarWebSocketImpl() { SonarWebSocketImpl::~SonarWebSocketImpl() {
stop(); stop();

4
xplat/Sonar/SonarWebSocketImpl.h
View File

@@ -10,6 +10,7 @@
#include <Sonar/SonarInitConfig.h> #include <Sonar/SonarInitConfig.h>
#include <Sonar/SonarWebSocket.h> #include <Sonar/SonarWebSocket.h>
#include <Sonar/SonarState.h>
#include <folly/Executor.h> #include <folly/Executor.h>
#include <folly/io/async/EventBase.h> #include <folly/io/async/EventBase.h>
#include <rsocket/RSocket.h> #include <rsocket/RSocket.h>
@@ -26,7 +27,7 @@ class SonarWebSocketImpl : public SonarWebSocket {
friend Responder; friend Responder;
public: public:
SonarWebSocketImpl(SonarInitConfig config); SonarWebSocketImpl(SonarInitConfig config, std::shared_ptr<SonarState> state);
~SonarWebSocketImpl(); ~SonarWebSocketImpl();
@@ -46,6 +47,7 @@ class SonarWebSocketImpl : public SonarWebSocket {
bool isOpen_ = false; bool isOpen_ = false;
Callbacks* callbacks_; Callbacks* callbacks_;
DeviceData deviceData_; DeviceData deviceData_;
std::shared_ptr<SonarState> sonarState_;
folly::EventBase* sonarEventBase_; folly::EventBase* sonarEventBase_;
folly::EventBase* connectionEventBase_; folly::EventBase* connectionEventBase_;

28
xplat/SonarTests/SonarClientTests.cpp
View File

@@ -19,6 +19,8 @@ namespace test {
using folly::dynamic; using folly::dynamic;
auto state = std::make_shared<SonarState>();
TEST(SonarClientTests, testSaneMocks) { TEST(SonarClientTests, testSaneMocks) {
SonarWebSocketMock socket; SonarWebSocketMock socket;
socket.start(); socket.start();
@@ -32,7 +34,7 @@ TEST(SonarClientTests, testSaneMocks) {
TEST(SonarClientTests, testGetPlugins) { TEST(SonarClientTests, testGetPlugins) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
client.start(); client.start();
client.addPlugin(std::make_shared<SonarPluginMock>("Cat")); client.addPlugin(std::make_shared<SonarPluginMock>("Cat"));
@@ -48,7 +50,7 @@ TEST(SonarClientTests, testGetPlugins) {
TEST(SonarClientTests, testGetPlugin) { TEST(SonarClientTests, testGetPlugin) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
const auto catPlugin = std::make_shared<SonarPluginMock>("Cat"); const auto catPlugin = std::make_shared<SonarPluginMock>("Cat");
client.addPlugin(catPlugin); client.addPlugin(catPlugin);
@@ -61,7 +63,7 @@ TEST(SonarClientTests, testGetPlugin) {
TEST(SonarClientTests, testGetPluginWithDowncast) { TEST(SonarClientTests, testGetPluginWithDowncast) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
const auto catPlugin = std::make_shared<SonarPluginMock>("Cat"); const auto catPlugin = std::make_shared<SonarPluginMock>("Cat");
client.addPlugin(catPlugin); client.addPlugin(catPlugin);
@@ -70,7 +72,7 @@ TEST(SonarClientTests, testGetPluginWithDowncast) {
TEST(SonarClientTests, testRemovePlugin) { TEST(SonarClientTests, testRemovePlugin) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
client.start(); client.start();
auto plugin = std::make_shared<SonarPluginMock>("Test"); auto plugin = std::make_shared<SonarPluginMock>("Test");
@@ -87,7 +89,7 @@ TEST(SonarClientTests, testRemovePlugin) {
TEST(SonarClientTests, testStartStop) { TEST(SonarClientTests, testStartStop) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
client.start(); client.start();
EXPECT_TRUE(socket->isOpen()); EXPECT_TRUE(socket->isOpen());
@@ -98,7 +100,7 @@ TEST(SonarClientTests, testStartStop) {
TEST(SonarClientTests, testConnectDisconnect) { TEST(SonarClientTests, testConnectDisconnect) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
bool pluginConnected = false; bool pluginConnected = false;
const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) { const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) {
@@ -121,7 +123,7 @@ TEST(SonarClientTests, testConnectDisconnect) {
TEST(SonarClientTests, testInitDeinit) { TEST(SonarClientTests, testInitDeinit) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
bool pluginConnected = false; bool pluginConnected = false;
const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) { const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) {
@@ -159,7 +161,7 @@ TEST(SonarClientTests, testInitDeinit) {
TEST(SonarClientTests, testRemovePluginWhenConnected) { TEST(SonarClientTests, testRemovePluginWhenConnected) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
bool pluginConnected = false; bool pluginConnected = false;
const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) { const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) {
@@ -180,7 +182,7 @@ TEST(SonarClientTests, testRemovePluginWhenConnected) {
TEST(SonarClientTests, testUnhandleableMethod) { TEST(SonarClientTests, testUnhandleableMethod) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
auto plugin = std::make_shared<SonarPluginMock>("Test"); auto plugin = std::make_shared<SonarPluginMock>("Test");
client.addPlugin(plugin); client.addPlugin(plugin);
@@ -200,7 +202,7 @@ TEST(SonarClientTests, testUnhandleableMethod) {
TEST(SonarClientTests, testExecute) { TEST(SonarClientTests, testExecute) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
client.start(); client.start();
const auto connectionCallback = [](std::shared_ptr<SonarConnection> conn) { const auto connectionCallback = [](std::shared_ptr<SonarConnection> conn) {
@@ -230,7 +232,7 @@ TEST(SonarClientTests, testExecute) {
TEST(SonarClientTests, testExecuteWithParams) { TEST(SonarClientTests, testExecuteWithParams) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) { const auto connectionCallback = [&](std::shared_ptr<SonarConnection> conn) {
const auto receiver = [](const dynamic &params, const auto receiver = [](const dynamic &params,
@@ -263,7 +265,7 @@ TEST(SonarClientTests, testExecuteWithParams) {
TEST(SonarClientTests, testExceptionUnknownPlugin) { TEST(SonarClientTests, testExceptionUnknownPlugin) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
client.start(); client.start();
dynamic messageInit = dynamic::object("method", "init")( dynamic messageInit = dynamic::object("method", "init")(
@@ -276,7 +278,7 @@ TEST(SonarClientTests, testExceptionUnknownPlugin) {
TEST(SonarClientTests, testExceptionUnknownApi) { TEST(SonarClientTests, testExceptionUnknownApi) {
auto socket = new SonarWebSocketMock; auto socket = new SonarWebSocketMock;
SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}); SonarClient client(std::unique_ptr<SonarWebSocketMock>{socket}, state);
client.start(); client.start();
dynamic messageInit = dynamic::object("method", "execute")( dynamic messageInit = dynamic::object("method", "execute")(