From f71fb70430d4f50bd055e1657a91d0c50c8bbccb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 2 Nov 2010 16:20:08 -0700 Subject: [PATCH] reconnect: Use macros instead of literals for default timeouts. --- lib/reconnect.c | 18 +++++++++++------- lib/reconnect.h | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/reconnect.c b/lib/reconnect.c index f39b178d7..d7357c202 100644 --- a/lib/reconnect.c +++ b/lib/reconnect.c @@ -95,9 +95,9 @@ reconnect_create(long long int now) struct reconnect *fsm = xzalloc(sizeof *fsm); fsm->name = xstrdup("void"); - fsm->min_backoff = 1000; - fsm->max_backoff = 8000; - fsm->probe_interval = 5000; + fsm->min_backoff = RECONNECT_DEFAULT_MIN_BACKOFF; + fsm->max_backoff = RECONNECT_DEFAULT_MAX_BACKOFF; + fsm->probe_interval = RECONNECT_DEFAULT_PROBE_INTERVAL; fsm->passive = false; fsm->info = VLL_INFO; @@ -157,7 +157,7 @@ reconnect_set_name(struct reconnect *fsm, const char *name) } /* Return the minimum number of milliseconds to back off between consecutive - * connection attempts. The default is 1000 ms. */ + * connection attempts. The default is RECONNECT_DEFAULT_MIN_BACKOFF. */ int reconnect_get_min_backoff(const struct reconnect *fsm) { @@ -165,7 +165,7 @@ reconnect_get_min_backoff(const struct reconnect *fsm) } /* Return the maximum number of milliseconds to back off between consecutive - * connection attempts. The default is 8000 ms. */ + * connection attempts. The default is RECONNECT_DEFAULT_MAX_BACKOFF. */ int reconnect_get_max_backoff(const struct reconnect *fsm) { @@ -209,12 +209,16 @@ reconnect_get_max_tries(struct reconnect *fsm) * attempts. * * 'min_backoff' must be at least 1000, and 'max_backoff' must be greater than - * or equal to 'min_backoff'. */ + * or equal to 'min_backoff'. + * + * Pass 0 for 'min_backoff' or 'max_backoff' or both to use the defaults. */ void reconnect_set_backoff(struct reconnect *fsm, int min_backoff, int max_backoff) { fsm->min_backoff = MAX(min_backoff, 1000); - fsm->max_backoff = max_backoff ? MAX(max_backoff, 1000) : 8000; + fsm->max_backoff = (max_backoff + ? MAX(max_backoff, 1000) + : RECONNECT_DEFAULT_MAX_BACKOFF); if (fsm->min_backoff > fsm->max_backoff) { fsm->max_backoff = fsm->min_backoff; } diff --git a/lib/reconnect.h b/lib/reconnect.h index 418f3e875..d316448f7 100644 --- a/lib/reconnect.h +++ b/lib/reconnect.h @@ -40,6 +40,11 @@ void reconnect_set_quiet(struct reconnect *, bool quiet); const char *reconnect_get_name(const struct reconnect *); void reconnect_set_name(struct reconnect *, const char *name); +/* Defaults, all in msecs. */ +#define RECONNECT_DEFAULT_MIN_BACKOFF 1000 +#define RECONNECT_DEFAULT_MAX_BACKOFF 8000 +#define RECONNECT_DEFAULT_PROBE_INTERVAL 5000 + int reconnect_get_min_backoff(const struct reconnect *); int reconnect_get_max_backoff(const struct reconnect *); int reconnect_get_probe_interval(const struct reconnect *); -- 2.43.0