From 2b682585a75109146f3cc54629364feb7819fab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20H=C3=BC=C3=9Fler?= Date: Mon, 14 Oct 2024 21:15:50 +0200 Subject: [PATCH 1/3] sys/ztimer: add ztimer_periodic_start_now() --- sys/include/ztimer/periodic.h | 13 +++++++++++++ sys/ztimer/periodic.c | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/sys/include/ztimer/periodic.h b/sys/include/ztimer/periodic.h index f2d5c1f13c5e..8cafe525b46d 100644 --- a/sys/include/ztimer/periodic.h +++ b/sys/include/ztimer/periodic.h @@ -130,6 +130,19 @@ void ztimer_periodic_init(ztimer_clock_t *clock, ztimer_periodic_t *timer, */ void ztimer_periodic_start(ztimer_periodic_t *timer); +/** + * @brief Start or restart a periodic timer without initial timer delay + * + * When called on a newly initialized timer, the timer will start. + * + * When called on an already running timer, the current interval is reset to its + * start (thus the next callback will be called after the configured interval + * has passed). + * + * @param[in] timer periodic timer object to work on + */ +void ztimer_periodic_start_now(ztimer_periodic_t *timer); + /** * @brief Stop a periodic timer * diff --git a/sys/ztimer/periodic.c b/sys/ztimer/periodic.c index 70cba0ece218..8542ae21f069 100644 --- a/sys/ztimer/periodic.c +++ b/sys/ztimer/periodic.c @@ -75,6 +75,11 @@ void ztimer_periodic_start(ztimer_periodic_t *timer) timer->last = ztimer_set(timer->clock, &timer->timer, timer->interval) + timer->interval; } +void ztimer_periodic_start_now(ztimer_periodic_t *timer) +{ + timer->last = ztimer_set(timer->clock, &timer->timer, 0); +} + void ztimer_periodic_stop(ztimer_periodic_t *timer) { ztimer_remove(timer->clock, &timer->timer); From 90473c62f060ff92b99f1e97636a9658c3e3fa2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20H=C3=BC=C3=9Fler?= Date: Mon, 14 Oct 2024 21:17:38 +0200 Subject: [PATCH 2/3] sys/event: add event_periodic_start_now() --- sys/event/periodic.c | 1 - sys/include/event/periodic.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sys/event/periodic.c b/sys/event/periodic.c index 948b8394a1e0..0abfa9d31993 100644 --- a/sys/event/periodic.c +++ b/sys/event/periodic.c @@ -25,7 +25,6 @@ static bool _event_periodic_callback(void *arg) { event_periodic_t *event_periodic = (event_periodic_t *)arg; - event_post(event_periodic->queue, event_periodic->event); if (event_periodic->count && --event_periodic->count == 0) { diff --git a/sys/include/event/periodic.h b/sys/include/event/periodic.h index 8f786d7ba9d7..47fc8e77cd37 100644 --- a/sys/include/event/periodic.h +++ b/sys/include/event/periodic.h @@ -72,6 +72,28 @@ typedef struct { void event_periodic_init(event_periodic_t *event_periodic, ztimer_clock_t *clock, event_queue_t *queue, event_t *event); +/** + * @brief Starts a periodic timeout without delay for the first occurrence + * + * This will make the event as configured in @p event_periodic be triggered + * at every interval ticks (based on event_periodic->clock). + * + * @note: the used event_periodic struct must stay valid until after the timeout + * event has been processed! + * + * @note: this function does not touch the current count value. + * + * @note: the periodic event will start without delay. + * + * @param[in] event_periodic event_timout context object to use + * @param[in] interval period length for the event + */ +static inline void event_periodic_start_now(event_periodic_t *event_periodic, uint32_t interval) +{ + event_periodic->timer.interval = interval; + ztimer_periodic_start_now(&event_periodic->timer); +} + /** * @brief Starts a periodic timeout * From d4cd708849137801e5eef5f224e58ab363c5deff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20H=C3=BC=C3=9Fler?= Date: Mon, 14 Oct 2024 21:18:27 +0200 Subject: [PATCH 3/3] tests/sys/event_ztimer: add event_periodic_start_now() to test --- tests/sys/event_ztimer/main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/sys/event_ztimer/main.c b/tests/sys/event_ztimer/main.c index 54ebead68eb1..5380c39422df 100644 --- a/tests/sys/event_ztimer/main.c +++ b/tests/sys/event_ztimer/main.c @@ -64,10 +64,9 @@ static void callback_4times(void *arg) uint8_t *count = (uint8_t *)arg; *count = *count + 1; - uint32_t now = event_periodic.timer.last; + uint32_t now = ztimer_now(ZTIMER_USEC); uint32_t elapsed = now - before; before = now; - expect((elapsed) >= 1 * US_PER_SEC); if (*count <= 4) { printf("trigger %d of periodic timeout, elapsed time: %" PRIu32 " us\n", *count, elapsed); @@ -110,8 +109,15 @@ int main(void) event_periodic_init(&event_periodic, ZTIMER_USEC, EVENT_PRIO_MEDIUM, &event_4times.super); event_periodic_set_count(&event_periodic, 4); + before = ztimer_now(ZTIMER_USEC); event_periodic_start(&event_periodic, EVENT_TIMEOUT_TIME); - before = event_periodic.timer.last; + puts("waiting for periodic callback to be triggered 4 times"); + mutex_lock(&lock); + puts("posting periodic timed callback with timeout 1sec and no delay"); + event_periodic_set_count(&event_periodic, 4); + iter = 0; /* reset callback argument counter to 0 */ + before = ztimer_now(ZTIMER_USEC); + event_periodic_start_now(&event_periodic, EVENT_TIMEOUT_TIME); puts("waiting for periodic callback to be triggered 4 times"); mutex_lock(&lock); puts("posting timed callback with timeout 0.5sec, clear right after");