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

Revert D8954014: [sonar] Start adding state annotations for diagnostic screen

Browse Source 
Differential Revision:
D8954014

Original commit changeset: 864156b0d3f5

fbshipit-source-id: 6dc0aaf56f609ade6123e450978df08f4b7331fc
This commit is contained in:
Daniel Abramowitz
2018-08-03 08:18:25 -07:00
committed by Facebook Github Bot
parent fadd392349
commit e82fd6371d
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xplat/Sonar/SonarClient.cpp
View File

@@ -47,16 +47,14 @@ void SonarClient::setStateListener(
void SonarClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) { void SonarClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
SONAR_LOG(("SonarClient::addPlugin " + plugin->identifier()).c_str()); SONAR_LOG(("SonarClient::addPlugin " + plugin->identifier()).c_str());
auto step = sonarState_->start("Add plugin " + plugin->identifier());
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
performAndReportError([this, plugin, step]() { performAndReportError([this, plugin]() {
if (plugins_.find(plugin->identifier()) != plugins_.end()) { if (plugins_.find(plugin->identifier()) != plugins_.end()) {
throw std::out_of_range( throw std::out_of_range(
"plugin " + plugin->identifier() + " already added."); "plugin " + plugin->identifier() + " already added.");
} }
plugins_[plugin->identifier()] = plugin; plugins_[plugin->identifier()] = plugin;
step->complete();
if (connected_) { if (connected_) {
refreshPlugins(); refreshPlugins();
} }
@@ -109,22 +107,19 @@ void SonarClient::refreshPlugins() {
void SonarClient::onConnected() { void SonarClient::onConnected() {
SONAR_LOG("SonarClient::onConnected"); SONAR_LOG("SonarClient::onConnected");
auto step = sonarState_->start("Connect");
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
connected_ = true; connected_ = true;
step->complete();
} }
void SonarClient::onDisconnected() { void SonarClient::onDisconnected() {
SONAR_LOG("SonarClient::onDisconnected"); SONAR_LOG("SonarClient::onDisconnected");
auto step = sonarState_->start("onDisconnected callbacks");
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
connected_ = false; connected_ = false;
performAndReportError([this, step]() { performAndReportError([this]() {
for (const auto& iter : plugins_) { for (const auto& iter : plugins_) {
disconnect(iter.second); disconnect(iter.second);
} }
step->complete();
}); });
} }

6
xplat/Sonar/SonarClient.h
View File

@@ -42,21 +42,15 @@ class SonarClient : public SonarWebSocket::Callbacks {
SonarClient(std::unique_ptr<SonarWebSocket> socket) SonarClient(std::unique_ptr<SonarWebSocket> socket)
: socket_(std::move(socket)) { : socket_(std::move(socket)) {
sonarState_ = std::make_unique<SonarState>(); sonarState_ = std::make_unique<SonarState>();
auto step = sonarState_->start("Create client");
socket_->setCallbacks(this); socket_->setCallbacks(this);
step->complete();
} }
void start() { void start() {
auto step = sonarState_->start("Start client");
socket_->start(); socket_->start();
step->complete();
} }
void stop() { void stop() {
auto step = sonarState_->start("Stop client");
socket_->stop(); socket_->stop();
step->complete();
} }
void onConnected() override; void onConnected() override;