Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

Merge pull request #6560 from AndersHoglund/fix_6348

Browse source 
Fix for issue #6348. Prevent dispatcher deadlock.
This commit is contained in:
Michael Keller 2018-08-30 19:23:45 +12:00 • committed by GitHub
commit bfee80b3df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/fc/dispatch.c
View file

@ -51,6 +51,7 @@ void dispatchProcess(uint32_t currentTime)
// unlink entry first, so handler can replan self // unlink entry first, so handler can replan self
dispatchEntry_t *current = *p; dispatchEntry_t *current = *p;
*p = (*p)->next; *p = (*p)->next;
current->inQue = false;
(*current->dispatch)(current); (*current->dispatch)(current);
} }
} }
@ -58,10 +59,17 @@ void dispatchProcess(uint32_t currentTime)
void dispatchAdd(dispatchEntry_t *entry, int delayUs) void dispatchAdd(dispatchEntry_t *entry, int delayUs)
{ {
uint32_t delayedUntil = micros() + delayUs; uint32_t delayedUntil = micros() + delayUs;
entry->delayedUntil = delayedUntil;
dispatchEntry_t **p = &head; dispatchEntry_t **p = &head;
if (entry->inQue) {
return; // Allready in Queue, abort
}
while (*p && cmp32((*p)->delayedUntil, delayedUntil) < 0) while (*p && cmp32((*p)->delayedUntil, delayedUntil) < 0)
p = &(*p)->next; p = &(*p)->next;
entry->next = *p; entry->next = *p;
entry->delayedUntil = delayedUntil;
entry->inQue = true;
*p = entry; *p = entry;
} }

1
src/main/fc/dispatch.h
View file

@ -27,6 +27,7 @@ typedef struct dispatchEntry_s {
dispatchFunc *dispatch; dispatchFunc *dispatch;
uint32_t delayedUntil; uint32_t delayedUntil;
struct dispatchEntry_s *next; struct dispatchEntry_s *next;
bool inQue;
} dispatchEntry_t; } dispatchEntry_t;
bool dispatchIsEnabled(void); bool dispatchIsEnabled(void);