Force SendableRegistry initialization

rzblue · Oct 21, 2024 · f3a323f · f3a323f
1 parent 2c9ad83
commit f3a323f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/wpilibc/src/main/native/cpp/Alert.cpp b/wpilibc/src/main/native/cpp/Alert.cpp
@@ -14,13 +14,17 @@
 
 #include <fmt/format.h>
 #include <networktables/NTSendableBuilder.h>
+#include <wpi/sendable/SendableRegistry.h>
 
 #include "frc/Errors.h"
 #include "frc/smartdashboard/SmartDashboard.h"
 
 using namespace frc;
 
 Alert::SendableAlerts& Alert::GetGroupSendable(std::string_view group) {
+  // Force initialization of SendableRegistry before our magic static to prevent
+  // incorrect destruction order.
+  wpi::SendableRegistry::EnsureInitialized();
   static wpi::StringMap<Alert::SendableAlerts> groups;
 
   auto [iter, exists] = groups.try_emplace(group);

diff --git a/wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp b/wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp
@@ -81,6 +81,10 @@ void ResetSendableRegistry() {
 }  // namespace wpi::impl
 #endif
 
+void SendableRegistry::EnsureInitialized() {
+  GetInstance();
+}
+
 void SendableRegistry::SetLiveWindowBuilderFactory(
     std::function<std::unique_ptr<SendableBuilder>()> factory) {
   GetInstance().liveWindowFactory = std::move(factory);

diff --git a/wpiutil/src/main/native/include/wpi/sendable/SendableRegistry.h b/wpiutil/src/main/native/include/wpi/sendable/SendableRegistry.h
@@ -26,6 +26,12 @@ class SendableRegistry final {
 
   using UID = size_t;
 
+  /**
+   * Initializes the SendableRegistry. This is used to ensure initialization and
+   * destruction order relative to Sendables.
+   */
+  static void EnsureInitialized();
+
   /**
    * Sets the factory for LiveWindow builders.
    *