*
* \brief Hardware independent timer driver (implementation)
*
- * \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
+ * \author Francesco Sacchi <batt@develer.com>
*/
#include "timer.h"
*/
REGISTER static List timers_queue;
-
/**
- * Add the specified timer to the software timer service queue.
- * When the delay indicated by the timer expires, the timer
- * device will execute the event associated with it.
- *
- * \note Interrupt safe
+ * This function really does the job. It adds \a timer to \a queue.
+ * \see timer_add for details.
*/
-void timer_add(Timer *timer)
+INLINE void timer_addToList(Timer *timer, List *queue)
{
- Timer *node;
- cpu_flags_t flags;
-
-
/* Inserting timers twice causes mayhem. */
ASSERT(timer->magic != TIMER_MAGIC_ACTIVE);
DB(timer->magic = TIMER_MAGIC_ACTIVE;)
- IRQ_SAVE_DISABLE(flags);
/* Calculate expiration time for this timer */
timer->tick = _clock + timer->_delay;
* Search for the first node whose expiration time is
* greater than the timer we want to add.
*/
- node = (Timer *)LIST_HEAD(&timers_queue);
+ Timer *node = (Timer *)LIST_HEAD(queue);
while (node->link.succ)
{
/*
/* Enqueue timer request into the list */
INSERT_BEFORE(&timer->link, &node->link);
-
- IRQ_RESTORE(flags);
}
+/**
+ * Add the specified timer to the software timer service queue.
+ * When the delay indicated by the timer expires, the timer
+ * device will execute the event associated with it.
+ *
+ * \note Interrupt safe
+ */
+void timer_add(Timer *timer)
+{
+ ATOMIC(timer_addToList(timer, &timers_queue));
+}
/**
* Remove a timer from the timers queue before it has expired.
return timer;
}
+
+INLINE void timer_poll(List *queue)
+{
+ Timer *timer;
+
+ /*
+ * Check the first timer request in the list and process
+ * it when it has expired. Repeat this check until the
+ * first node has not yet expired. Since the list is sorted
+ * by expiry time, all the following requests are guaranteed
+ * to expire later.
+ */
+ while ((timer = (Timer *)LIST_HEAD(queue))->link.succ)
+ {
+ /* This request in list has not yet expired? */
+ if (timer_clock() - timer->tick < 0)
+ break;
+
+ /* Retreat the expired timer */
+ REMOVE(&timer->link);
+ DB(timer->magic = TIMER_MAGIC_INACTIVE;)
+
+ /* Execute the associated event */
+ event_do(&timer->expire);
+ }
+}
+
+/**
+ * Add \a timer to \a queue.
+ * \see synctimer_poll() for details.
+ */
+void synctimer_add(Timer *timer, List *queue)
+{
+ timer_addToList(timer, queue);
+}
+
+/**
+ * Simple synchronous timer based scheduler polling routine.
+ *
+ * Sometimes you would like to have a proper scheduler,
+ * but you can't afford it due to memory constraints.
+ *
+ * This is a simple replacement: you can create events and call
+ * them periodically at specific time intervals.
+ * All you have to do is to set up normal timers, and call synctimer_add()
+ * instead of timer_add() to add the events to your specific queue.
+ * Then, in the main loop or wherever you want, you can call
+ * synctimer_poll() to process expired events. The associated callbacks will be
+ * executed.
+ * As this is done synchronously you don't have to worry about race conditions.
+ * You can kill an event by simply calling synctimer_abort().
+ *
+ */
+void synctimer_poll(List *queue)
+{
+ timer_poll(queue);
+}
+
#endif /* CONFIG_TIMER_EVENTS */
#pragma interrupt saveall
#endif
-#if CONFIG_TIMER_EVENTS
- Timer *timer;
-#endif
-
/*
* On systems sharing IRQ line and vector, this check is needed
* to ensure that IRQ is generated by timer source.
/* Update the master ms counter */
++_clock;
-#if CONFIG_TIMER_EVENTS
- /*
- * Check the first timer request in the list and process
- * it when it has expired. Repeat this check until the
- * first node has not yet expired. Since the list is sorted
- * by expiry time, all the following requests are guaranteed
- * to expire later.
- */
- while ((timer = (Timer *)LIST_HEAD(&timers_queue))->link.succ)
- {
- /* This request in list has not yet expired? */
- if (_clock - timer->tick < 0)
- break;
-
- /* Retreat the expired timer */
- REMOVE(&timer->link);
- DB(timer->magic = TIMER_MAGIC_INACTIVE;)
-
- /* Execute the associated event */
- event_do(&timer->expire);
- }
-#endif /* CONFIG_TIMER_EVENTS */
+ #if CONFIG_TIMER_EVENTS
+ timer_poll(&timers_queue);
+ #endif
TIMER_STROBE_OFF;
}
}
static Timer test_timers[5];
+
+List synctimer_list;
+static Timer synctimer_timers[5];
+
+static void synctimer_test_hook(iptr_t _timer)
+{
+ Timer *timer = (Timer *)(void *)_timer;
+ kprintf("Sync timer process %lu expired\n", (unsigned long)ticks_to_ms(timer->_delay));
+ synctimer_add(timer, &synctimer_list);
+}
+
+
static const mtime_t test_delays[5] = { 170, 50, 310, 1500, 310 };
static void timer_test_async(void)
}
}
+static void synctimer_test(void)
+{
+ size_t i;
+
+ for (i = 0; i < countof(synctimer_timers); ++i)
+ {
+ Timer *timer = &synctimer_timers[i];
+ timer_setDelay(timer, ms_to_ticks(test_delays[i]));
+ timer_setSoftint(timer, synctimer_test_hook, (iptr_t)timer);
+ synctimer_add(timer, &synctimer_list);
+ }
+
+ int secs = 0;
+ mtime_t start_time = ticks_to_ms(timer_clock());
+ mtime_t now;
+
+ while (secs <= 10)
+ {
+ now = ticks_to_ms(timer_clock());
+ synctimer_poll(&synctimer_list);
+ if (now - start_time >= 1000)
+ {
+ ++secs;
+ start_time += 1000;
+ kprintf("seconds = %d, ticks=%lu\n", secs, (unsigned long)now);
+ }
+ wdt_reset();
+ }
+
+ for (i = 0; i < countof(synctimer_timers); ++i)
+ {
+ synctimer_abort(&synctimer_timers[i]);
+ }
+}
+
int timer_testSetup(void)
{
IRQ_ENABLE;
wdt_start(7);
timer_init();
+ LIST_INIT(&synctimer_list);
kdbg_init();
return 0;
}
timer_test_delay();
timer_test_async();
timer_test_poll();
+ synctimer_test();
return 0;
}
projects / bertos.git / commitdiff