Do not setup ConfigurationMgr via PlatformMgr on each platform (#21075)

src/include/platform/ConfigurationManager.h

@@ -181,17 +181,26 @@ class ConfigurationManager
 /**
  * Returns a reference to a ConfigurationManager object.
  *
- * Applications should use this to access the features of the ConfigurationManager.
+ * Applications should use this to access features of the ConfigurationManager object
+ * that are common to all platforms.
  */
-extern ConfigurationManager & ConfigurationMgr();
+ConfigurationManager & ConfigurationMgr();
+
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+extern ConfigurationManager & ConfigurationMgrImpl();
 
 /**
  * Sets a reference to a ConfigurationManager object.
  *
  * This must be called before any calls to ConfigurationMgr. If a nullptr is passed in,
  * no changes will be made.
  */
-extern void SetConfigurationMgr(ConfigurationManager * configurationManager);
+void SetConfigurationMgr(ConfigurationManager * configurationManager);
 
 inline CHIP_ERROR ConfigurationManager::GetLocationCapability(uint8_t & location)
 {

src/platform/Ameba/ConfigurationManagerImpl.cpp

@@ -284,5 +284,10 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
  // sys_reset();
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Ameba/ConfigurationManagerImpl.h

@@ -76,5 +76,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  static void DoFactoryReset(intptr_t arg);
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Ameba/PlatformManagerImpl.cpp

@@ -59,8 +59,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
  CHIP_ERROR err;
 
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
-
  // Make sure the LwIP core lock has been initialized
  err = Internal::InitLwIPCoreLock();
 

src/platform/CYW30739/ConfigurationManagerImpl.cpp

@@ -212,5 +212,10 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
  wiced_hal_wdog_reset_system();
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/CYW30739/ConfigurationManagerImpl.h

@@ -74,5 +74,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  static void DoFactoryReset(intptr_t arg);
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/CYW30739/PlatformManagerImpl.cpp

@@ -45,8 +45,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
  err = PersistedStorage::KeyValueStoreMgrImpl().Init();
  SuccessOrExit(err);
 
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
-
  /* Create the thread object. */
  mThread = wiced_rtos_create_thread();
  VerifyOrExit(mThread != nullptr, err = CHIP_ERROR_NO_MEMORY);

src/platform/Darwin/ConfigurationManagerImpl.cpp

@@ -496,5 +496,10 @@ void ConfigurationManagerImpl::RunConfigUnitTest(void)
 #endif // CHIP_DISABLE_PLATFORM_KVS
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Darwin/ConfigurationManagerImpl.h

@@ -92,5 +92,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  void RunConfigUnitTest(void) override;
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Darwin/PlatformManagerImpl.cpp

@@ -52,7 +52,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
  SuccessOrExit(err);
  SetDeviceInstanceInfoProvider(&DeviceInstanceInfoProviderMgrImpl());
 #endif // CHIP_DISABLE_PLATFORM_KVS
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
 
  mRunLoopSem = dispatch_semaphore_create(0);
 

src/platform/EFR32/ConfigurationManagerImpl.cpp

@@ -307,5 +307,10 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
 }
 #endif
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/EFR32/ConfigurationManagerImpl.h

@@ -82,7 +82,15 @@ inline CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * b
 {
  return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
-
 #endif /* SL_WIFI */
+
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/EFR32/PlatformManagerImpl.cpp

@@ -50,8 +50,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
  err = chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().Init();
  SuccessOrExit(err);
 
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
-
 #if CHIP_SYSTEM_CONFIG_USE_LWIP
  // Initialize LwIP.
  tcpip_init(NULL, NULL);

src/platform/ESP32/ConfigurationManagerImpl.cpp

@@ -337,5 +337,10 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
  esp_restart();
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/ESP32/ConfigurationManagerImpl.h

@@ -87,5 +87,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  static void DoFactoryReset(intptr_t arg);
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/ESP32/PlatformManagerImpl.cpp

@@ -59,8 +59,6 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
 
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
-
  esp_err_t err;
  // Arrange for CHIP-encapsulated ESP32 errors to be translated to text
  Internal::ESP32Utils::RegisterESP32ErrorFormatter();

src/platform/Linux/ConfigurationManagerImpl.cpp

@@ -397,5 +397,10 @@ CHIP_ERROR ConfigurationManagerImpl::GetLocationCapability(uint8_t & location)
  return err;
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Linux/ConfigurationManagerImpl.h

@@ -88,5 +88,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  static void DoFactoryReset(intptr_t arg);
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Linux/PlatformManagerImpl.cpp

@@ -175,7 +175,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
 
  // Initialize the configuration system.
  ReturnErrorOnFailure(Internal::PosixConfig::Init());
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
  SetDeviceInstanceInfoProvider(&DeviceInstanceInfoProviderMgrImpl());
 
  // Call _InitChipStack() on the generic implementation base class

src/platform/P6/ConfigurationManagerImpl.cpp

@@ -238,5 +238,10 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
  NVIC_SystemReset();
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/P6/ConfigurationManagerImpl.h

@@ -78,5 +78,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  static void DoFactoryReset(intptr_t arg);
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/P6/PlatformManagerImpl.cpp

@@ -43,8 +43,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
  CHIP_ERROR err;
 
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
-
  // Make sure the LwIP core lock has been initialized
  err = Internal::InitLwIPCoreLock();
  SuccessOrExit(err);

src/platform/SingletonConfigurationManager.cpp

@@ -21,6 +21,7 @@
  */
 
 #include <lib/support/CodeUtils.h>
+#include <platform/ConfigurationManager.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -37,8 +38,12 @@ ConfigurationManager * gInstance = nullptr;
 
 ConfigurationManager & ConfigurationMgr()
 {
- VerifyOrDie(gInstance != nullptr);
- return *gInstance;
+ if (gInstance != nullptr)
+ {
+ return *gInstance;
+ }
+
+ return ConfigurationMgrImpl();
 }
 
 void SetConfigurationMgr(ConfigurationManager * configurationManager)

src/platform/Tizen/ConfigurationManagerImpl.cpp

@@ -177,5 +177,10 @@ void ConfigurationManagerImpl::RunConfigUnitTest(void)
  PosixConfig::RunConfigUnitTest();
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Tizen/ConfigurationManagerImpl.h

@@ -72,5 +72,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  void RunConfigUnitTest(void) override;
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Tizen/PlatformManagerImpl.cpp

@@ -39,7 +39,6 @@ PlatformManagerImpl PlatformManagerImpl::sInstance;
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
  ReturnErrorOnFailure(Internal::PosixConfig::Init());
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
  SetDeviceInstanceInfoProvider(&DeviceInstanceInfoProviderMgrImpl());
 
  return Internal::GenericPlatformManagerImpl_POSIX<PlatformManagerImpl>::_InitChipStack();

src/platform/Zephyr/ConfigurationManagerImpl.cpp

@@ -180,5 +180,10 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
  PlatformMgr().Shutdown();
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Zephyr/ConfigurationManagerImpl.h

@@ -99,5 +99,13 @@ inline CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * /
  return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Zephyr/PlatformManagerImpl.cpp

@@ -106,7 +106,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
  // Initialize the configuration system.
  err = Internal::ZephyrConfig::Init();
  SuccessOrExit(err);
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
 
 #if !CONFIG_NORDIC_SECURITY_BACKEND
  // Add entropy source based on Zephyr entropy driver

src/platform/android/ConfigurationManagerImpl.cpp

@@ -215,5 +215,10 @@ CHIP_ERROR ConfigurationManagerImpl::GetUniqueId(char * buf, size_t bufSize)
  return ReadConfigValueStr(AndroidConfig::kConfigKey_UniqueId, buf, bufSize, dateLen);
 }
 
+ConfigurationManager & ConfigurationMgrImpl()
+{
+ return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/android/ConfigurationManagerImpl.h

@@ -83,5 +83,13 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
  jobject mConfigurationManagerObject = nullptr;
 };
 
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/android/PlatformManagerImpl.cpp

@@ -46,7 +46,6 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
  // Initialize the configuration system.
  err = Internal::AndroidConfig::Init();
  SuccessOrExit(err);
- SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
  SetDeviceInstanceInfoProvider(&DeviceInstanceInfoProviderMgrImpl());
 
  // Call _InitChipStack() on the generic implementation base class