Merge pull request #31 from meulemanelectronics/TSBM-485

TSBM-485 Properly delete task.
meulemanelectronics · Dec 18, 2024 · 52010b8 · 52010b8
2 parents 9cd9c09 + b421aa0
commit 52010b8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp
@@ -278,9 +278,7 @@ void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::EventLoopTaskMain(void * ar
 {
     ChipLogDetail(DeviceLayer, "CHIP event task running");
     static_cast<GenericPlatformManagerImpl_FreeRTOS<ImplClass> *>(arg)->Impl()->RunEventLoop();
-    // TODO: At this point, should we not
-    // vTaskDelete(static_cast<GenericPlatformManagerImpl_FreeRTOS<ImplClass> *>(arg)->mEventLoopTask)?
-    // Or somehow get our caller to do it once this thread is joined?
+    vTaskDelete(static_cast<GenericPlatformManagerImpl_FreeRTOS<ImplClass> *>(arg)->mEventLoopTask);
 }
 
 template <class ImplClass>
@@ -423,7 +421,8 @@ template <class ImplClass>
 CHIP_ERROR GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_StopEventLoopTask(void)
 {
     mShouldRunEventLoop.store(false);
-    return CHIP_NO_ERROR;
+    ChipDeviceEvent noop{ .Type = DeviceEventType::kNoOp };
+    return DeviceLayer::PlatformMgr().PostEvent(&noop);
 }
 
 // Fully instantiate the generic implementation class in whatever compilation unit includes this file.