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

fix the bloody longterm vtimer bug #374

Merged
merged 4 commits into from
Dec 4, 2013
Merged

fix the bloody longterm vtimer bug #374

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cb63ee
fix the bloody longterm vtimer bug
LudwigKnuepfer Nov 22, 2013
1c8e9a4
add license header
LudwigKnuepfer Nov 22, 2013
92f4aa3
fix grammar in license header
LudwigKnuepfer Nov 22, 2013
c607376
fixed warnings in vtimer
Dec 3, 2013
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
43 changes: 36 additions & 7 deletions sys/vtimer/vtimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/**
* virtual timer
*
* Copyright (C) 2013 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser General
* Public License. See the file LICENSE in the top level directory for more
* details.
*
* @ingroup vtimer
* @{
* @file
* @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de> (author)
* @author Oliver Hahm <oliver.hahm@inria.fr> (modifications)
* @author Ludwig Ortmann <ludwig.ortmann@fu-berlin.de> (cleaning up the mess)
* @}
*/

#include <stddef.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -53,6 +71,10 @@ static int set_longterm(vtimer_t *timer)

static int update_shortterm(void)
{
if (shortterm_queue_root.next == NULL) {
DEBUG("update_shortterm: shortterm_queue_root.next == NULL - dont know what to do here\n");
return 0;
}
if (hwtimer_id != -1) {
if (hwtimer_next_absolute != shortterm_queue_root.next->priority) {
hwtimer_remove(hwtimer_id);
Expand All @@ -64,10 +86,16 @@ static int update_shortterm(void)

hwtimer_next_absolute = shortterm_queue_root.next->priority;

uint32_t next = hwtimer_next_absolute + longterm_tick_start;
uint32_t next = hwtimer_next_absolute;
uint32_t now = HWTIMER_TICKS_TO_US(hwtimer_now());

/* make sure the longterm_tick_timer does not get truncated */
if (((vtimer_t*)shortterm_queue_root.next)->action != vtimer_tick) {
next += longterm_tick_start;
}

if((next - HWTIMER_TICKS_TO_US(VTIMER_THRESHOLD) - now) > MICROSECONDS_PER_TICK ) {
DEBUG("truncating next (next - HWTIMER_TICKS_TO_US(VTIMER_THRESHOLD) - now): %i\n", (next - HWTIMER_TICKS_TO_US(VTIMER_THRESHOLD) - now));
next = now + HWTIMER_TICKS_TO_US(VTIMER_BACKOFF);
}

Expand All @@ -80,11 +108,11 @@ static int update_shortterm(void)
void vtimer_tick(void *ptr)
{
(void) ptr;
DEBUG("vtimer_tick().");
DEBUG("vtimer_tick().\n");
seconds += SECONDS_PER_TICK;

longterm_tick_start = longterm_tick_timer.absolute.microseconds;
longterm_tick_timer.absolute.microseconds = longterm_tick_timer.absolute.microseconds + MICROSECONDS_PER_TICK;
longterm_tick_timer.absolute.microseconds += MICROSECONDS_PER_TICK;
set_shortterm(&longterm_tick_timer);

while (longterm_queue_root.next) {
Expand All @@ -98,8 +126,6 @@ void vtimer_tick(void *ptr)
break;
}
}

update_shortterm();
}

static int set_shortterm(vtimer_t *timer)
Expand Down Expand Up @@ -134,6 +160,9 @@ void vtimer_callback(void *ptr)
else if (timer->action == (void (*)(void *)) thread_wakeup){
timer->action(timer->arg);
}
else if (timer->action == vtimer_tick) {
vtimer_tick(NULL);
}
else {
DEBUG("Timer was poisoned.\n");
}
Expand Down Expand Up @@ -243,7 +272,7 @@ int vtimer_init()
int vtimer_set_wakeup(vtimer_t *t, timex_t interval, int pid)
{
int ret;
t->action = (void *) thread_wakeup;
t->action = (void(*)(void *)) thread_wakeup;
t->arg = (void *) pid;
t->absolute = interval;
t->pid = 0;
Expand Down Expand Up @@ -282,7 +311,7 @@ int vtimer_remove(vtimer_t *t)

int vtimer_set_msg(vtimer_t *t, timex_t interval, unsigned int pid, void *ptr)
{
t->action = (void *) msg_send_int;
t->action = (void(*)(void *)) msg_send_int;
t->arg = ptr;
t->absolute = interval;
t->pid = pid;
Expand Down