RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #3260 from gebart/pr/vtimer-remove-before-add

Browse Source 
sys/vtimer: Remove timer before adding.
This commit is contained in:
Oleg Hahm 2015-07-01 15:31:57 +02:00
commit 5cab734d78
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/vtimer/vtimer.c
View File

@ -97,6 +97,12 @@ static inline vtimer_t *node_get_timer(priority_queue_node_t *node)
static int set_longterm(vtimer_t *timer) static int set_longterm(vtimer_t *timer)
{ {
timer->priority_queue_entry.priority = timer->absolute.seconds; timer->priority_queue_entry.priority = timer->absolute.seconds;
/* *** UGLY FIX BEGINS *** */
/* Workaround for a bug in a so far undiscovered location which causes the
* vtimer to add the same timer twice, locking the system in an infinite
* loop inside priority_queue_add. */
priority_queue_remove(&longterm_priority_queue_root, timer_get_node(timer));
/* *** UGLY FIX ENDS *** */
priority_queue_add(&longterm_priority_queue_root, timer_get_node(timer)); priority_queue_add(&longterm_priority_queue_root, timer_get_node(timer));
return 0; return 0;
} }
@ -189,6 +195,12 @@ static int set_shortterm(vtimer_t *timer)
{ {
DEBUG("set_shortterm(): Absolute: %" PRIu32 " %" PRIu32 "\n", timer->absolute.seconds, timer->absolute.microseconds); DEBUG("set_shortterm(): Absolute: %" PRIu32 " %" PRIu32 "\n", timer->absolute.seconds, timer->absolute.microseconds);
timer->priority_queue_entry.priority = timer->absolute.microseconds; timer->priority_queue_entry.priority = timer->absolute.microseconds;
/* *** UGLY FIX BEGINS *** */
/* Workaround for a bug in a so far undiscovered location which causes the
* vtimer to add the same timer twice, locking the system in an infinite
* loop inside priority_queue_add. */
priority_queue_remove(&shortterm_priority_queue_root, timer_get_node(timer));
/* *** UGLY FIX ENDS *** */
priority_queue_add(&shortterm_priority_queue_root, timer_get_node(timer)); priority_queue_add(&shortterm_priority_queue_root, timer_get_node(timer));
return 1; return 1;
} }