deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

major bug fix: arithmetic was done incorrectly in update_time() + process already expired timers when adding timers

Browse source
This commit is contained in:
nifi 2006-10-09 16:05:58 +00:00
parent 85fa271548
commit 755ee04e24
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/sys/etimer.c
View file

@ -42,7 +42,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: etimer.c,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $ * $Id: etimer.c,v 1.2 2006/10/09 16:05:58 nifi Exp $
*/ */
#include "contiki-conf.h" #include "contiki-conf.h"
@ -59,19 +59,22 @@ static void
update_time(void) update_time(void)
{ {
clock_time_t nextt; clock_time_t nextt;
clock_time_t now;
struct etimer *t; struct etimer *t;
if (timerlist == NULL) { if (timerlist == NULL) {
next_expiration = 0; next_expiration = 0;
} else { } else {
now = clock_time();
t = timerlist; t = timerlist;
nextt = t->timer.start + t->timer.interval; /* Must take current time into account due to wraps */
nextt = t->timer.start + t->timer.interval - now;
for(t = t->next; t != NULL; t = t->next) { for(t = t->next; t != NULL; t = t->next) {
if(t->timer.start + t->timer.interval < nextt) { if(t->timer.start + t->timer.interval - now < nextt) {
nextt = t->timer.start + t->timer.interval; nextt = t->timer.start + t->timer.interval - now;
} }
} }
next_expiration = nextt; next_expiration = nextt + now;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -150,6 +153,8 @@ add_timer(struct etimer *timer)
{ {
struct etimer *t; struct etimer *t;
etimer_request_poll();
if(timer->p != PROCESS_NONE) { if(timer->p != PROCESS_NONE) {
/* Timer not on list. */ /* Timer not on list. */