From 88e4462e611540ce57554dcbb6794df57f7bf7b7 Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Wed, 16 Oct 2013 03:32:32 +0000 Subject: [PATCH] bfd: Add bfd_wake_time() function. This commit adds a new function "bfd_wake_time()" that returns the next wakeup time associated with the "struct bfd". Signed-off-by: Alex Wang Signed-off-by: Ethan Jackson Acked-by: Ethan Jackson --- lib/bfd.c | 26 ++++++++++++++++++++------ lib/bfd.h | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/bfd.c b/lib/bfd.c index 6c9e92027..115053bee 100644 --- a/lib/bfd.c +++ b/lib/bfd.c @@ -446,16 +446,30 @@ bfd_unref(struct bfd *bfd) OVS_EXCLUDED(mutex) void bfd_wait(const struct bfd *bfd) OVS_EXCLUDED(mutex) { - ovs_mutex_lock(&mutex); - if (bfd->flags & FLAG_FINAL) { - poll_immediate_wake(); + poll_timer_wait_until(bfd_wake_time(bfd)); +} + +/* Returns the next wake up time. */ +long long int +bfd_wake_time(const struct bfd *bfd) OVS_EXCLUDED(mutex) +{ + long long int retval; + + if (!bfd) { + return LLONG_MAX; } - poll_timer_wait_until(bfd->next_tx); - if (bfd->state > STATE_DOWN) { - poll_timer_wait_until(bfd->detect_time); + ovs_mutex_lock(&mutex); + if (bfd->flags & FLAG_FINAL) { + retval = 0; + } else { + retval = bfd->next_tx; + if (bfd->state > STATE_DOWN) { + retval = MIN(bfd->detect_time, retval); + } } ovs_mutex_unlock(&mutex); + return retval; } void diff --git a/lib/bfd.h b/lib/bfd.h index 0e1e33d09..f49a3d6d7 100644 --- a/lib/bfd.h +++ b/lib/bfd.h @@ -49,5 +49,5 @@ void bfd_unref(struct bfd *); bool bfd_forwarding(const struct bfd *); void bfd_get_status(const struct bfd *, struct smap *); void bfd_set_netdev(struct bfd *, const struct netdev *); - +long long int bfd_wake_time(const struct bfd *); #endif /* bfd.h */ -- 2.47.0