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

[wpilibc] Add mechanism to reset various global structures (#4007)

Browse Source
This commit is contained in:
Dustin Spicuzza
2022-02-10 01:14:12 -05:00
committed by GitHub
parent 4e3cc25012
commit 74de97eeca
4 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/src/main/native/cpp/Preferences.cpp
View File

@@ -30,6 +30,14 @@ static Instance& GetInstance() {
return instance;
}
#ifndef __FRC_ROBORIO__
namespace frc::impl {
void ResetPreferencesInstance() {
GetInstance() = Instance();
}
} // namespace frc::impl
#endif
Preferences* Preferences::GetInstance() {
::GetInstance();
static Preferences instance;

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

@@ -48,11 +48,23 @@ struct Instance {
};
} // namespace
static Instance& GetInstance() {
static Instance instance;
static std::unique_ptr<Instance>& GetInstanceHolder() {
static std::unique_ptr<Instance> instance = std::make_unique<Instance>();
return instance;
}
static Instance& GetInstance() {
return *GetInstanceHolder();
}
#ifndef __FRC_ROBORIO__
namespace frc::impl {
void ResetLiveWindow() {
std::make_unique<Instance>().swap(GetInstanceHolder());
}
} // namespace frc::impl
#endif
std::shared_ptr<Component> Instance::GetOrAdd(wpi::Sendable* sendable) {
auto data = std::static_pointer_cast<Component>(
wpi::SendableRegistry::GetData(sendable, dataHandle));

16
wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
View File

@@ -29,11 +29,23 @@ struct Instance {
};
} // namespace
static Instance& GetInstance() {
static Instance instance;
static std::unique_ptr<Instance>& GetInstanceHolder() {
static std::unique_ptr<Instance> instance = std::make_unique<Instance>();
return instance;
}
static Instance& GetInstance() {
return *GetInstanceHolder();
}
#ifndef __FRC_ROBORIO__
namespace frc::impl {
void ResetSmartDashboardInstance() {
std::make_unique<Instance>().swap(GetInstanceHolder());
}
} // namespace frc::impl
#endif
void SmartDashboard::init() {
GetInstance();
}

17
wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp
View File

@@ -60,11 +60,24 @@ Component& SendableRegistryInst::GetOrAdd(void* sendable,
return *components[compUid - 1];
}
static SendableRegistryInst& GetInstance() {
static SendableRegistryInst instance;
static std::unique_ptr<SendableRegistryInst>& GetInstanceHolder() {
static std::unique_ptr<SendableRegistryInst> instance =
std::make_unique<SendableRegistryInst>();
return instance;
}
static SendableRegistryInst& GetInstance() {
return *GetInstanceHolder();
}
#ifndef __FRC_ROBORIO__
namespace wpi::impl {
void ResetSendableRegistry() {
std::make_unique<SendableRegistryInst>().swap(GetInstanceHolder());
}
} // namespace wpi::impl
#endif
void SendableRegistry::SetLiveWindowBuilderFactory(
std::function<std::unique_ptr<SendableBuilder>()> factory) {
GetInstance().liveWindowFactory = std::move(factory);