Fix flash_safe_execute timeout under FreeRTOS #2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In some cases, the flash lockout task can start on the wrong core and not have time to move to the correct core before exit is called. This causes a timeout as the exit function is looking at the wrong core when checking for the lockout task.
| TaskHandle_t task_handle; | ||
| if (pdPASS != xTaskCreate(flash_lockout_task, "flash lockout", configMINIMAL_STACK_SIZE, (void *)core_num, 0, &task_handle)) { | ||
| if (pdPASS != xTaskCreateAffinitySet(flash_lockout_task, "flash lockout", configMINIMAL_STACK_SIZE, (void *)core_num, 0, 1u << (core_num ^ 1), &task_handle)) { | ||
| return PICO_ERROR_INSUFFICIENT_RESOURCES; | ||
| } | ||
| lockout_state[core_num] = FREERTOS_LOCKOUT_LOCKER_WAITING; |
There was a problem hiding this comment.
I wonder if this line should be moved before the call to xTaskCreateAffinitySet
There was a problem hiding this comment.
Hmm yes it probably should, as otherwise it'll use the previous lockout state.
There was a problem hiding this comment.
and then there's no point creating it with a low priority? May as well make it super high immediately?
There was a problem hiding this comment.
All sounds reasonable! I'll change it to do that and give it a test tomorrow 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In some cases, the flash lockout task can start on the wrong core and not have time to move to the correct core before exit is called. This causes a timeout as the exit function is looking at the wrong core when checking for the lockout task.
Fixes #2007.