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

ContikiMAC: use RTIMER_GUARD_TIME #define to avoid accidentally scheduling a rtimer in the past on platforms with fast rtimer ticks

Browse source
This commit is contained in:
Atis Elsts 2015-08-18 15:30:20 +02:00
parent bc17cdca2c
commit b5d17bb620
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/net/mac/contikimac/contikimac.c
View file

@ -296,14 +296,18 @@ static void
schedule_powercycle(struct rtimer *t, rtimer_clock_t time) schedule_powercycle(struct rtimer *t, rtimer_clock_t time)
{ {
int r; int r;
rtimer_clock_t now;
if(contikimac_is_on) { if(contikimac_is_on) {
if(RTIMER_CLOCK_LT(RTIMER_TIME(t) + time, RTIMER_NOW() + 2)) { time += RTIMER_TIME(t);
time = RTIMER_NOW() - RTIMER_TIME(t) + 2; now = RTIMER_NOW();
if(RTIMER_CLOCK_LT(time, now + RTIMER_GUARD_TIME)) {
time = now + RTIMER_GUARD_TIME;
} }
r = rtimer_set(t, RTIMER_TIME(t) + time, 1, powercycle_wrapper, NULL); r = rtimer_set(t, time, 1, powercycle_wrapper, NULL);
if(r != RTIMER_OK) { if(r != RTIMER_OK) {
PRINTF("schedule_powercycle: could not set rtimer\n"); PRINTF("schedule_powercycle: could not set rtimer\n");
} }
@ -314,11 +318,13 @@ static void
schedule_powercycle_fixed(struct rtimer *t, rtimer_clock_t fixed_time) schedule_powercycle_fixed(struct rtimer *t, rtimer_clock_t fixed_time)
{ {
int r; int r;
rtimer_clock_t now;
if(contikimac_is_on) { if(contikimac_is_on) {
if(RTIMER_CLOCK_LT(fixed_time, RTIMER_NOW() + 1)) { now = RTIMER_NOW();
fixed_time = RTIMER_NOW() + 1; if(RTIMER_CLOCK_LT(fixed_time, now + RTIMER_GUARD_TIME)) {
fixed_time = now + RTIMER_GUARD_TIME;
} }
r = rtimer_set(t, fixed_time, 1, powercycle_wrapper, NULL); r = rtimer_set(t, fixed_time, 1, powercycle_wrapper, NULL);

10
core/sys/rtimer.h
View file

@ -151,6 +151,16 @@ void rtimer_arch_schedule(rtimer_clock_t t);
#define RTIMER_SECOND RTIMER_ARCH_SECOND #define RTIMER_SECOND RTIMER_ARCH_SECOND
/* RTIMER_GUARD_TIME is the minimum amount of rtimer ticks between
the current time and the future time when a rtimer is scheduled.
Necessary to avoid accidentally scheduling a rtimer in the past
on platforms with fast rtimer ticks. Should be >= 2. */
#ifdef RTIMER_CONF_GUARD_TIME
#define RTIMER_GUARD_TIME RTIMER_CONF_GUARD_TIME
#else /* RTIMER_CONF_GUARD_TIME */
#define RTIMER_GUARD_TIME (RTIMER_ARCH_SECOND >> 14)
#endif /* RTIMER_CONF_GUARD_TIME */
#endif /* RTIMER_H_ */ #endif /* RTIMER_H_ */
/** @} */ /** @} */