[OTA] Shutdown server and stop event loop directly from OTA Image Pro…

…cessor (project-chip#16698)
chencheung · Apr 6, 2022 · 248c2e1 · 248c2e1
1 parent 50908b4
commit 248c2e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/app/clusters/ota-requestor/OTARequestor.cpp b/src/app/clusters/ota-requestor/OTARequestor.cpp
@@ -286,11 +286,6 @@ void OTARequestor::Reset()
     StoreCurrentUpdateInfo();
 }
 
-void OTARequestor::Shutdown(void)
-{
-    mServer->DispatchShutDownAndStopEventLoop();
-}
-
 EmberAfStatus OTARequestor::HandleAnnounceOTAProvider(app::CommandHandler * commandObj,
                                                       const app::ConcreteCommandPath & commandPath,
                                                       const AnnounceOtaProvider::DecodableType & commandData)

diff --git a/src/app/clusters/ota-requestor/OTARequestor.h b/src/app/clusters/ota-requestor/OTARequestor.h
@@ -41,7 +41,6 @@ class OTARequestor : public OTARequestorInterface, public BDXDownloader::StateDe
 
     //////////// OTARequestorInterface Implementation ///////////////
     void Reset(void) override;
-    void Shutdown(void) override;
 
     EmberAfStatus HandleAnnounceOTAProvider(
         app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,

diff --git a/src/app/clusters/ota-requestor/OTARequestorInterface.h b/src/app/clusters/ota-requestor/OTARequestorInterface.h
@@ -156,9 +156,6 @@ class OTARequestorInterface
     // Reset any relevant states
     virtual void Reset(void) = 0;
 
-    // Perform any clean up necessary
-    virtual void Shutdown(void) = 0;
-
     // Handler for the AnnounceOTAProvider command
     virtual EmberAfStatus HandleAnnounceOTAProvider(
         chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,

diff --git a/src/platform/Linux/OTAImageProcessorImpl.cpp b/src/platform/Linux/OTAImageProcessorImpl.cpp
@@ -104,9 +104,12 @@ CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
     }
 
     uint32_t currentVersion;
+    uint32_t targetVersion = requestor->GetTargetVersion();
     ReturnErrorOnFailure(DeviceLayer::ConfigurationMgr().GetSoftwareVersion(currentVersion));
-    if (currentVersion != requestor->GetTargetVersion())
+    if (currentVersion != targetVersion)
     {
+        ChipLogError(SoftwareUpdate, "Current software version = %" PRIu32 ", expected software version = %" PRIu32, currentVersion,
+                     targetVersion);
         return CHIP_ERROR_INCORRECT_STATE;
     }
 
@@ -167,8 +170,9 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
     rename(imageProcessor->mImageFile, kImageExecPath);
     chmod(kImageExecPath, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
 
-    // Shutdown the stack and expect to boot into the new image once shutdown is complete
-    requestor->Shutdown();
+    // Shutdown the stack and expect to boot into the new image once the event loop is stopped
+    DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) { DeviceLayer::PlatformMgr().HandleServerShuttingDown(); });
+    DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) { DeviceLayer::PlatformMgr().StopEventLoopTask(); });
 }
 
 void OTAImageProcessorImpl::HandleAbort(intptr_t context)