X-Git-Url: https://codewiz.org/gitweb?p=bertos.git;a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.h;h=f20212e7e1e01ec4fe7706703e8a955e68cff5d8;hp=b006c5f4a3037b753a2b5bb3005983a1cbf4e053;hb=a5b1dc3c2884ee2160c6fee43e4a34b83453b87f;hpb=7911a6f01bc8a19f220f98e2fdc8595f65996853

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index b006c5f4..f20212e7 100644
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -62,6 +62,7 @@
 #include <cpu/attr.h>
 #include <cpu/irq.h>
 
+#include <string.h>
 
 /*
  * Include platform-specific binding header if we're hosted.
@@ -310,23 +311,77 @@ void synctimer_add(Timer *timer, List* q);
 
 void synctimer_poll(List* q);
 
+/**
+ * Extract the timeout for the next event.
+ *
+ * \return Timeout of the next event (may be 0), or -1 on errors.
+ */
+INLINE ticks_t synctimer_nextTimeout(List *q)
+{
+	ticks_t timeout = -1;
+
+	if (!LIST_EMPTY(q))
+	{
+		Timer *expiring_timer = (Timer *)LIST_HEAD(q);
+		timeout = MAX(expiring_timer->tick - timer_clock(), (ticks_t)0);
+	}
+	return timeout;
+}
 
-#endif /* CONFIG_TIMER_EVENTS */
+/*
+ * Explicitly mark a timer as executed.
+ *
+ * When a timer is marked as executed, it is inactive until the next
+ * call to synctimer_add().
+ * Normally you shouldn't need to call this function explicitly, as all
+ * timers in this module are designed to stop themselves after a while
+ * (eg. retransmission timer will stop after a few retransmissions).
+ * The only exception is at startup, where you should mark all timers
+ * as executed to avoid spurious events.
+ *
+ * \note We can't rely on REMOVE() of synctimer_poll() since in release mode
+ * it is empty.
+ */
+INLINE void synctimer_executed(Timer *t)
+{
+	memset(&t->link, 0, sizeof(Node));
+}
+
+/*
+ * Test if a timer is active.
+ *
+ * In the general case it should be ATOMIC() and timer.link should always
+ * be memset() to 0.
+ */
+INLINE bool synctimer_active(Timer *t)
+{
+	return !(t->link.pred == NULL && t->link.succ == NULL);
+}
 
-#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
-/** Set the timer so that it sends a event notification when it expires */
-INLINE void timer_setEvent(Timer *timer)
+INLINE void synctimer_stop(Timer *timer)
 {
-	event_initGeneric(&timer->expire);
+	if (synctimer_active(timer))
+	{
+		timer_abort(timer);
+		synctimer_executed(timer);
+	}
 }
 
-/** Wait until the timer expires */
-INLINE void timer_waitEvent(Timer *timer)
+INLINE void synctimer_restart(Timer *timer, List *list, mtime_t timeout)
 {
-	event_wait(&timer->expire);
+	synctimer_stop(timer);
+
+	timer_setDelay(timer, ms_to_ticks(timeout));
+	synctimer_add(timer, list);
 }
 
+void synctimer_readd(Timer *timer, List *queue);
+
+#endif /* CONFIG_TIMER_EVENTS */
+
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+
 /** Set the timer so that it sends a signal when it expires */
 INLINE void timer_setSignal(Timer *timer, struct Process *proc, sigmask_t sigs)
 {