mirrors/flipperzero-firmware
1
Fork 0
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 04:41:26 +04:00
Code Issues Activity

[FL-3957] EventLoop unsubscribe fix (#4109)

Browse Source 
* Fix memory leak during event loop unsubscription
* Event better memory leak fix
* unit test for the fix

Co-authored-by: Georgii Surkov <georgii.surkov@outlook.com>
This commit is contained in:
Anna Antonenko
2025-02-17 01:57:23 +04:00
committed by GitHub
parent 429c0dd387
commit 4895ae5d0d
4 changed files with 72 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
furi/core/event_loop.c
View File

@@ -32,14 +32,6 @@ static void furi_event_loop_item_notify(FuriEventLoopItem* instance);
static bool furi_event_loop_item_is_waiting(FuriEventLoopItem* instance);
static void furi_event_loop_process_pending_callbacks(FuriEventLoop* instance) {
for(; !PendingQueue_empty_p(instance->pending_queue);
PendingQueue_pop_back(NULL, instance->pending_queue)) {
const FuriEventLoopPendingQueueItem* item = PendingQueue_back(instance->pending_queue);
item->callback(item->context);
}
}
static bool furi_event_loop_signal_callback(uint32_t signal, void* arg, void* context) {
furi_assert(context);
FuriEventLoop* instance = context;
@@ -130,12 +122,16 @@ static inline FuriEventLoopProcessStatus
furi_event_loop_unsubscribe(instance, item->object);
}
instance->current_item = item;
if(item->event & FuriEventLoopEventFlagEdge) {
status = furi_event_loop_process_edge_event(item);
} else {
status = furi_event_loop_process_level_event(item);
}
instance->current_item = NULL;
if(item->owner == NULL) {
status = FuriEventLoopProcessStatusFreeLater;
}
@@ -193,6 +189,14 @@ static void furi_event_loop_process_waiting_list(FuriEventLoop* instance) {
furi_event_loop_sync_flags(instance);
}
static void furi_event_loop_process_pending_callbacks(FuriEventLoop* instance) {
for(; !PendingQueue_empty_p(instance->pending_queue);
PendingQueue_pop_back(NULL, instance->pending_queue)) {
const FuriEventLoopPendingQueueItem* item = PendingQueue_back(instance->pending_queue);
item->callback(item->context);
}
}
static void furi_event_loop_restore_flags(FuriEventLoop* instance, uint32_t flags) {
if(flags) {
xTaskNotifyIndexed(
@@ -203,7 +207,6 @@ static void furi_event_loop_restore_flags(FuriEventLoop* instance, uint32_t flag
void furi_event_loop_run(FuriEventLoop* instance) {
furi_check(instance);
furi_check(instance->thread_id == furi_thread_get_current_id());
FuriThread* thread = furi_thread_get_current();
// Set the default signal callback if none was previously set
@@ -213,9 +216,9 @@ void furi_event_loop_run(FuriEventLoop* instance) {
furi_event_loop_init_tick(instance);
while(true) {
instance->state = FuriEventLoopStateIdle;
instance->state = FuriEventLoopStateRunning;
while(true) {
const TickType_t ticks_to_sleep =
MIN(furi_event_loop_get_timer_wait_time(instance),
furi_event_loop_get_tick_wait_time(instance));
@@ -224,8 +227,6 @@ void furi_event_loop_run(FuriEventLoop* instance) {
BaseType_t ret = xTaskNotifyWaitIndexed(
FURI_EVENT_LOOP_FLAG_NOTIFY_INDEX, 0, FuriEventLoopFlagAll, &flags, ticks_to_sleep);
instance->state = FuriEventLoopStateProcessing;
if(ret == pdTRUE) {
if(flags & FuriEventLoopFlagStop) {
instance->state = FuriEventLoopStateStopped;
@@ -448,7 +449,7 @@ void furi_event_loop_unsubscribe(FuriEventLoop* instance, FuriEventLoopObject* o
WaitingList_unlink(item);
}
if(instance->state == FuriEventLoopStateProcessing) {
if(instance->current_item == item) {
furi_event_loop_item_free_later(item);
} else {
furi_event_loop_item_free(item);

4
furi/core/event_loop_i.h
View File

@@ -64,8 +64,7 @@ typedef enum {
typedef enum {
FuriEventLoopStateStopped,
FuriEventLoopStateIdle,
FuriEventLoopStateProcessing,
FuriEventLoopStateRunning,
} FuriEventLoopState;
typedef struct {
@@ -81,6 +80,7 @@ struct FuriEventLoop {
// Poller state
volatile FuriEventLoopState state;
volatile FuriEventLoopItem* current_item;
// Event handling
FuriEventLoopTree_t tree;