remove the coupling of InteractionModelEngine in DefaultTimerDelegate (project-chip#41928)

zenghuchen-gg · restyled-commits · web-flow · commit 712670569355 · 2025-11-12T14:58:14.000Z
* remove the coupling of InteractionModelEngine in DefaultTimerDelegate

* update dependency

* Restyled by clang-format

* add missing header

* add timer-delegate-default to app dependency

* relocate DefaultTimerDelegate to platform

* cleanup

* Restyled by clang-format

* update based on master change

---------

Co-authored-by: Restyled.io &lt;commits@restyled.io&gt;
diff --git a/examples/all-clusters-app/esp32/main/Globals.cpp b/examples/all-clusters-app/esp32/main/Globals.cpp
@@ -18,7 +18,7 @@
 
 #include "Globals.h"
 #include "DeviceCallbacks.h"
-#include <app/DefaultTimerDelegate.h>
+#include <platform/DefaultTimerDelegate.h>
 
 LEDWidget statusLED1;
 LEDWidget statusLED2;
diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp
@@ -44,7 +44,6 @@
 #include <Options.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
-#include <app/DefaultTimerDelegate.h>
 #include <app/clusters/diagnostic-logs-server/diagnostic-logs-server.h>
 #include <app/clusters/identify-server/IdentifyCluster.h>
 #include <app/clusters/identify-server/identify-server.h>
@@ -60,6 +59,7 @@
 #include <app/util/attribute-storage.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 #include <lib/support/CHIPMem.h>
+#include <platform/DefaultTimerDelegate.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/PlatformManager.h>
diff --git a/examples/all-devices-app/all-devices-common/devices/device-factory/DeviceFactory.h b/examples/all-devices-app/all-devices-common/devices/device-factory/DeviceFactory.h
@@ -17,12 +17,12 @@
 
 #pragma once
 
-#include <app/DefaultTimerDelegate.h>
 #include <devices/Types.h>
 #include <devices/boolean-state-sensor/BooleanStateSensorDevice.h>
 #include <functional>
 #include <lib/core/CHIPError.h>
 #include <map>
+#include <platform/DefaultTimerDelegate.h>
 
 namespace chip::app {
 
diff --git a/examples/energy-management-app/energy-management-common/common/src/Identify.cpp b/examples/energy-management-app/energy-management-common/common/src/Identify.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Identify.h"
-#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip::app;
 
diff --git a/examples/lighting-app-data-mode-no-unique-id/linux/Identify.cpp b/examples/lighting-app-data-mode-no-unique-id/linux/Identify.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Identify.h"
-#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip::app;
 
diff --git a/examples/lit-icd-app/lit-icd-common/Identify.cpp b/examples/lit-icd-app/lit-icd-common/Identify.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Identify.h"
-#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip::app;
 
diff --git a/examples/lock-app/lock-common/src/Identify.cpp b/examples/lock-app/lock-common/src/Identify.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Identify.h"
-#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip::app;
 
diff --git a/examples/microwave-oven-app/microwave-oven-common/src/Identify.cpp b/examples/microwave-oven-app/microwave-oven-common/src/Identify.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Identify.h"
-#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip::app;
 
diff --git a/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp b/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp
@@ -30,8 +30,8 @@
 #include <data-model-providers/codegen/Instance.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
-#include <app/DefaultTimerDelegate.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
+#include <platform/DefaultTimerDelegate.h>
 
 #include <platform/CommissionableDataProvider.h>
 
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -69,10 +69,10 @@
 static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore;
 #endif
 
-#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
 #include <data-model-providers/codegen/Instance.h>
 #include <headers/ProvisionManager.h>
+#include <platform/DefaultTimerDelegate.h>
 
 #ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
 #include "SilabsTestEventTriggerDelegate.h" // nogncheck
diff --git a/examples/rvc-app/linux/Identify.cpp b/examples/rvc-app/linux/Identify.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Identify.h"
-#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
+#include <platform/DefaultTimerDelegate.h>
 
 using namespace chip::app;
 
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -175,8 +175,6 @@ static_library("interaction-model") {
     "CASESessionManager.h",
     "CommandSender.cpp",
     "CommandSender.h",
-    "DefaultTimerDelegate.cpp",
-    "DefaultTimerDelegate.h",
     "DeviceProxy.cpp",
     "DeviceProxy.h",
     "InteractionModelDelegatePointers.cpp",
diff --git a/src/app/clusters/identify-server/CodegenIntegration.cpp b/src/app/clusters/identify-server/CodegenIntegration.cpp
@@ -23,7 +23,6 @@
 #include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/identify-server/IdentifyCluster.h>
 #include <app/server-cluster/DefaultServerCluster.h>
@@ -32,6 +31,7 @@
 #include <data-model-providers/codegen/CodegenProcessingConfig.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/TimerDelegate.h>
+#include <platform/DefaultTimerDelegate.h>
 #include <tracing/macros.h>
 
 namespace {
diff --git a/src/app/clusters/identify-server/README.md b/src/app/clusters/identify-server/README.md
@@ -56,7 +56,7 @@ for each endpoint that requires it. Using `RegisteredServerCluster` simplifies
 registration.
 
 ```cpp
-#include "app/DefaultTimerDelegate.h"
+#include "platform/DefaultTimerDelegate.h"
 #include "app/server-cluster/ServerClusterInterfaceRegistry.h"
 
 // In a .cpp file
@@ -113,7 +113,7 @@ you more control and results in a smaller, more efficient binary.
 // In a header or source file:
 #include "app/clusters/identify-server/IdentifyCluster.h"
 #include "app/server-cluster/ServerClusterInterfaceRegistry.h"
-#include "app/DefaultTimerDelegate.h"
+#include "platform/DefaultTimerDelegate.h"
 
 class MyIdentifyDelegate : public chip::app::Clusters::IdentifyDelegate { /* ... */ };
 
diff --git a/src/app/reporting/tests/MockReportScheduler.cpp b/src/app/reporting/tests/MockReportScheduler.cpp
@@ -16,9 +16,9 @@
  *    limitations under the License.
  */
 
-#include <app/DefaultTimerDelegate.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <app/reporting/SynchronizedReportSchedulerImpl.h>
+#include <platform/DefaultTimerDelegate.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -27,6 +27,7 @@
 #include <app/data-model-provider/Provider.h>
 #include <app/server/Dnssd.h>
 #include <app/server/EchoHandler.h>
+#include <platform/DefaultTimerDelegate.h>
 
 #if CONFIG_NETWORK_LAYER_BLE
 #include <ble/Ble.h>
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -46,6 +46,7 @@
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/SafeInt.h>
 #include <messaging/ExchangeMgr.h>
+#include <platform/DefaultTimerDelegate.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/KeyValueStoreManager.h>
 #include <platform/KvsPersistentStorageDelegate.h>
@@ -68,7 +69,6 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
 #include <transport/raw/WiFiPAF.h>
 #endif
-#include <app/DefaultTimerDelegate.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <transport/raw/UDP.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_NFC_BASED_COMMISSIONING
diff --git a/src/app/tests/TestCommissioningWindowManager.cpp b/src/app/tests/TestCommissioningWindowManager.cpp
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#include <app/DefaultTimerDelegate.h>
 #include <app/TestEventTriggerDelegate.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <app/server/CommissioningWindowManager.h>
@@ -28,6 +27,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/CommissionableDataProvider.h>
 #include <platform/ConfigurationManager.h>
+#include <platform/DefaultTimerDelegate.h>
 #include <platform/PlatformManager.h>
 #include <platform/TestOnlyCommissionableDataProvider.h>
 #include <protocols/secure_channel/PASESession.h>
diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp
@@ -511,10 +511,12 @@ class TestReadInteraction : public chip::Test::AppContext
         mOldProvider = InteractionModelEngine::GetInstance()->SetDataModelProvider(&TestImCustomDataModel::Instance());
         chip::Test::SetMockNodeConfig(TestMockNodeConfig());
         chip::Test::SetVersionTo(chip::Test::kTestDataVersion1);
+        chip::DeviceLayer::SetSystemLayerForTesting(&GetSystemLayer());
     }
 
     void TearDown() override
     {
+        chip::DeviceLayer::SetSystemLayerForTesting(nullptr);
         chip::Test::ResetMockNodeConfig();
         InteractionModelEngine::GetInstance()->SetDataModelProvider(mOldProvider);
         chip::app::EventManagement::DestroyEventManagement();
diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -24,7 +24,6 @@
 
 #include <controller/CHIPDeviceControllerFactory.h>
 
-#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
 #include <app/OperationalSessionSetup.h>
 #include <app/reporting/ReportSchedulerImpl.h>
@@ -35,6 +34,7 @@
 #if CONFIG_DEVICE_LAYER
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/ConfigurationManager.h>
+#include <platform/DefaultTimerDelegate.h>
 #endif
 
 #include <app/server/Dnssd.h>
diff --git a/src/include/platform/DefaultTimerDelegate.h b/src/include/platform/DefaultTimerDelegate.h
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -489,6 +489,7 @@ if (chip_device_platform != "none") {
       "../include/platform/CommissionableDataProvider.h",
       "../include/platform/ConfigurationManager.h",
       "../include/platform/ConnectivityManager.h",
+      "../include/platform/DefaultTimerDelegate.h",
       "../include/platform/DeviceControlServer.h",
       "../include/platform/DeviceInstanceInfoProvider.h",
       "../include/platform/GeneralFaults.h",
@@ -533,6 +534,7 @@ if (chip_device_platform != "none") {
       "../include/platform/internal/GenericPlatformManagerImpl_Zephyr.h",
       "../include/platform/internal/testing/ConfigUnitTest.h",
       "CommissionableDataProvider.cpp",
+      "DefaultTimerDelegate.cpp",
       "DeviceControlServer.cpp",
       "DeviceInfoProvider.cpp",
       "DeviceInstanceInfoProvider.cpp",
@@ -576,6 +578,7 @@ if (chip_device_platform != "none") {
       "${chip_root}/src/app/util:types",
       "${chip_root}/src/crypto",
       "${chip_root}/src/lib/support",
+      "${chip_root}/src/lib/support:timer-delegate",
     ]
 
     if (chip_device_platform == "cc13x4_26x4") {
diff --git a/src/platform/DefaultTimerDelegate.cpp b/src/platform/DefaultTimerDelegate.cpp
@@ -15,8 +15,8 @@
  *    limitations under the License.
  */
 
-#include <app/DefaultTimerDelegate.h>
-#include <app/InteractionModelEngine.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/DefaultTimerDelegate.h>
 #include <system/SystemClock.h>
 
 using Timeout = chip::System::Clock::Timeout;
@@ -31,19 +31,15 @@ static void TimerCallbackInterface(System::Layer * aLayer, void * aAppState)
 }
 CHIP_ERROR DefaultTimerDelegate::StartTimer(TimerContext * context, Timeout aTimeout)
 {
-    // TODO(#41825): Remove the coupling of InteractionModelEngine
-    return InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->StartTimer(
-        aTimeout, TimerCallbackInterface, context);
+    return DeviceLayer::SystemLayer().StartTimer(aTimeout, TimerCallbackInterface, context);
 }
 void DefaultTimerDelegate::CancelTimer(TimerContext * context)
 {
-    InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->CancelTimer(
-        TimerCallbackInterface, context);
+    DeviceLayer::SystemLayer().CancelTimer(TimerCallbackInterface, context);
 }
 bool DefaultTimerDelegate::IsTimerActive(TimerContext * context)
 {
-    return InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->IsTimerActive(
-        TimerCallbackInterface, context);
+    return DeviceLayer::SystemLayer().IsTimerActive(TimerCallbackInterface, context);
 }
 
 System::Clock::Timestamp DefaultTimerDelegate::GetCurrentMonotonicTimestamp()
