Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete the ChipEventQueue and BackgroundEventQueue after returning from the event loop. #37489

Merged
merged 4 commits into from
Feb 14, 2025
Merged

Delete the ChipEventQueue and BackgroundEventQueue after returning from the event loop. #37489

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71d7d08
Delete the ChipEventQueue and BackgroundEventQueue after returning fr…
jadhavrohit924 Feb 10, 2025
b9fc37a
Addressed review comments.
jadhavrohit924 Feb 12, 2025
ed6281c
Delete event queues in the shutdown.
jadhavrohit924 Feb 13, 2025
53297f1
Delete the ChipLock mutex as well in the shutdown.
jadhavrohit924 Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,7 @@ CHIP_ERROR GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_InitChipStack(void)

vTaskSetTimeOutState(&mNextTimerBaseTime);
mNextTimerDurationTicks = 0;
// TODO: This nulling out of mEventLoopTask should happen when we shut down
// the task, not here!
mEventLoopTask = NULL;
#if defined(CHIP_DEVICE_CONFIG_ENABLE_BG_EVENT_PROCESSING) && CHIP_DEVICE_CONFIG_ENABLE_BG_EVENT_PROCESSING
mBackgroundEventLoopTask = NULL;
#endif
mChipTimerActive = false;

// We support calling Shutdown followed by InitChipStack, because some tests
// do that. To keep things simple for existing consumers, we keep not
// destroying our lock and queue in shutdown, but rather check whether they
// already exist here before trying to create them.
mChipTimerActive = false;

if (mChipStackLock == NULL)
{
Expand Down Expand Up @@ -277,10 +266,11 @@ template <class ImplClass>
void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::EventLoopTaskMain(void * arg)
{
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?
GenericPlatformManagerImpl_FreeRTOS<ImplClass> * platformManager =
static_cast<GenericPlatformManagerImpl_FreeRTOS<ImplClass> *>(arg);
platformManager->Impl()->RunEventLoop();
vTaskDelete(NULL);
jadhavrohit924 marked this conversation as resolved.
Show resolved Hide resolved
platformManager->mEventLoopTask = NULL;
}

template <class ImplClass>
Expand Down Expand Up @@ -376,7 +366,11 @@ template <class ImplClass>
void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::BackgroundEventLoopTaskMain(void * arg)
{
ChipLogDetail(DeviceLayer, "CHIP background task running");
static_cast<GenericPlatformManagerImpl_FreeRTOS<ImplClass> *>(arg)->Impl()->RunBackgroundEventLoop();
GenericPlatformManagerImpl_FreeRTOS<ImplClass> * platformManager =
static_cast<GenericPlatformManagerImpl_FreeRTOS<ImplClass> *>(arg);
platformManager->Impl()->RunBackgroundEventLoop();
vTaskDelete(NULL);
platformManager->mBackgroundEventLoopTask = NULL;
}
#endif

Expand Down Expand Up @@ -416,6 +410,20 @@ void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::PostEventFromISR(const Chip
template <class ImplClass>
void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_Shutdown(void)
{
if (mChipEventQueue)
{
vQueueDelete(mChipEventQueue);
mChipEventQueue = NULL;
}
#if defined(CHIP_DEVICE_CONFIG_ENABLE_BG_EVENT_PROCESSING) && CHIP_DEVICE_CONFIG_ENABLE_BG_EVENT_PROCESSING
if (mBackgroundEventQueue)
{
vQueueDelete(mBackgroundEventQueue);
mBackgroundEventQueue = NULL;
}
#endif
vSemaphoreDelete(mChipStackLock);
mChipStackLock = NULL;
GenericPlatformManagerImpl<ImplClass>::_Shutdown();
}

Expand Down
Loading