Make sure chip-tool interactive cleanup happens on the Matter thread. (…

…#21661) The interactive cleanup happens while the event loop is still running (during the execution of the "interactive" command), so queuing the cleanup on the event loop is reasonable. And this ensures cleanups don't run into MAtter locking assertions.
project-chip · Aug 8, 2022 · 4b366e2 · 4b366e2
1 parent 117dd16
commit 4b366e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -453,7 +453,7 @@ void CHIPCommand::StopWaiting()
 #endif // CONFIG_USE_SEPARATE_EVENTLOOP
 }
 
-void CHIPCommand::ExecuteDeferredCleanups()
+void CHIPCommand::ExecuteDeferredCleanups(intptr_t ignored)
 {
     for (auto * cmd : sDeferredCleanups)
     {

diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h
@@ -115,7 +115,7 @@ class CHIPCommand : public Command
     virtual bool DeferInteractiveCleanup() { return false; }
 
     // Execute any deferred cleanups.  Used when exiting interactive mode.
-    void ExecuteDeferredCleanups();
+    static void ExecuteDeferredCleanups(intptr_t ignored);
 
 #ifdef CONFIG_USE_LOCAL_STORAGE
     PersistentStorage mDefaultStorage;

diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -89,7 +89,7 @@ bool InteractiveStartCommand::ParseCommand(char * command)
 {
     if (strcmp(command, kInteractiveModeStopCommand) == 0)
     {
-        ExecuteDeferredCleanups();
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(ExecuteDeferredCleanups, 0);
         return false;
     }