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

SendableBase: remove unnecessary synchronization (#1797)

Browse Source 
Also fixes the move constructor to update LiveWindow to follow the move.
This commit is contained in:
Oblarg
2019-08-03 02:47:17 -04:00
committed by Peter Johnson
parent e6d348f382
commit 3b12276bc3
5 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
View File

@@ -81,9 +81,9 @@ void LiveWindow::AddChild(Sendable* parent, void* child) {
comp.telemetryEnabled = false;
}
void LiveWindow::Remove(Sendable* sendable) {
bool LiveWindow::Remove(Sendable* sendable) {
std::scoped_lock lock(m_impl->mutex);
m_impl->components.erase(sendable);
return m_impl->components.erase(sendable);
}
void LiveWindow::EnableTelemetry(Sendable* sendable) {

42
wpilibc/src/main/native/cpp/smartdashboard/SendableBase.cpp
View File

@@ -17,39 +17,35 @@ SendableBase::SendableBase(bool addLiveWindow) {
if (addLiveWindow) LiveWindow::GetInstance()->Add(this);
}
SendableBase::~SendableBase() { LiveWindow::GetInstance()->Remove(this); }
SendableBase::SendableBase(SendableBase&& rhs) {
m_name = std::move(rhs.m_name);
m_subsystem = std::move(rhs.m_subsystem);
SendableBase::SendableBase(SendableBase&& other)
: m_name(std::move(other.m_name)),
m_subsystem(std::move(other.m_subsystem)) {
auto&& lw = LiveWindow::GetInstance();
if (lw->Remove(&other)) {
lw->Add(this);
}
}
SendableBase& SendableBase::operator=(SendableBase&& rhs) {
Sendable::operator=(std::move(rhs));
m_name = std::move(rhs.m_name);
m_subsystem = std::move(rhs.m_subsystem);
SendableBase& SendableBase::operator=(SendableBase&& other) {
m_name = std::move(other.m_name);
m_subsystem = std::move(other.m_subsystem);
auto&& lw = LiveWindow::GetInstance();
if (lw->Remove(&other)) {
lw->Add(this);
}
return *this;
}
std::string SendableBase::GetName() const {
std::scoped_lock lock(m_mutex);
return m_name;
}
SendableBase::~SendableBase() { LiveWindow::GetInstance()->Remove(this); }
void SendableBase::SetName(const wpi::Twine& name) {
std::scoped_lock lock(m_mutex);
m_name = name.str();
}
std::string SendableBase::GetName() const { return m_name; }
std::string SendableBase::GetSubsystem() const {
std::scoped_lock lock(m_mutex);
return m_subsystem;
}
void SendableBase::SetName(const wpi::Twine& name) { m_name = name.str(); }
std::string SendableBase::GetSubsystem() const { return m_subsystem; }
void SendableBase::SetSubsystem(const wpi::Twine& subsystem) {
std::scoped_lock lock(m_mutex);
m_subsystem = subsystem.str();
}