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

[Bugfix] Manipulate deferred executor slot only if tokens match #22722

Merged
merged 1 commit into from
Dec 20, 2023
Merged

[Bugfix] Manipulate deferred executor slot only if tokens match #22722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions quantum/deferred_exec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,19 @@ void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count,

// Run through each of the executors
for (int i = 0; i < table_count; ++i) {
deferred_executor_t *entry = &table[i];
deferred_executor_t *entry = &table[i];
deferred_token curr_token = entry->token;

// Check if we're supposed to execute this entry
if (entry->token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) {
if (curr_token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) {
// Invoke the callback and work work out if we should be requeued
uint32_t delay_ms = entry->callback(entry->trigger_time, entry->cb_arg);

// If the token has changed, then the callback has canceled and re-queued. Skip further processing.
if (entry->token != curr_token) {
continue;
}

// Update the trigger time if we have to repeat, otherwise clear it out
if (delay_ms > 0) {
// Intentionally add just the delay to the existing trigger time -- this ensures the next
Expand Down