Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 07:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix view_port_update() apps random deadlocks

Browse Source
This commit is contained in:
Willy-JL
2023-09-10 03:07:10 +02:00
parent 7f022f6b03
commit ee5d5b9a8c
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
applications/services/gui/view_port.c
View File

@@ -174,9 +174,23 @@ void view_port_input_callback_set(
void view_port_update(ViewPort* view_port) {
furi_assert(view_port);
furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
// view_port_update() does not modify viewport memory
// nor does it need time sensitive data in order to work
// but when used in apps in a input loop it can cause deadlocks with draw() being called by other means
// example:
// - app selector keeps loading animation in background, keeps drawing
// - because of this gui starts draw and locks viewport mutex, not in app render callback yet
// - app gets input, locks app mutex
// - app input handler calls view_port_update() which needs viewport mutex
// - viewport mutex already locked by draw previously
// - but app mutex locked by input so draw cannot complete
// - DEADLOCK => mutex removed from view_port_update()
// this is just one example, there may be many more edge cases
// point is, this view_port_update() has no need at all for mutex
// dont copy paste mutex into all functions to close jira tasks please :)
// furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
if(view_port->gui && view_port->is_enabled) gui_update(view_port->gui);
furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
// furi_check(furi_mutex_release(view_port->mutex) == FuriStatusOk);
}
void view_port_gui_set(ViewPort* view_port, Gui* gui) {