The branch stable/13 has been updated by cperciva:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ce9a5b417909d2617b6580df1e25136394b928a0
commit ce9a5b417909d2617b6580df1e25136394b928a0
Author: Isaac Cilia Attard <icatt...@freebsd.org>
AuthorDate: 2024-07-08 05:43:09 +0000
Commit: Colin Percival <cperc...@freebsd.org>
CommitDate: 2024-08-20 04:58:35 +0000
dhclient: Switch timeouts from time_t to timespec
Introduce a new function, add_timeout_timespec(), to use timespec
structs to handle timeouts. Make add_timeout() into a wrapper for the
latter function to retain compatibility with the rest of the codebase.
No functional change intended.
Sponsored by: Google LLC (GSoC 2024)
Signed-off-by: Isaac Cilia Attard <icatt...@freebsd.org>
MFC after: 10 days
Reviwed by: cperciva, brooks, Tom Hukins, Alexander Ziaee
Pull Request: https://github.com/freebsd/freebsd-src/pull/1368
(cherry picked from commit 16a235f23c066d27b3a53c66cf6aa329be07cdb9)
---
sbin/dhclient/dhcpd.h | 3 ++-
sbin/dhclient/dispatch.c | 28 +++++++++++++++++++---------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 33c34c9ca9df..8e4c1344843a 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -218,7 +218,7 @@ struct interface_info {
struct timeout {
struct timeout *next;
- time_t when;
+ struct timespec when;
void (*func)(void *);
void *what;
};
@@ -320,6 +320,7 @@ void reinitialize_interfaces(void);
void dispatch(void);
void got_one(struct protocol *);
void add_timeout(time_t, void (*)(void *), void *);
+void add_timeout_timespec(struct timespec, void (*)(void *), void *);
void cancel_timeout(void (*)(void *), void *);
void add_protocol(const char *, int, void (*)(struct protocol *), void *);
void remove_protocol(struct protocol *);
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 7347736cc787..c02cb2c52796 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -166,7 +166,8 @@ dispatch(void)
int count, live_interfaces, i, to_msec, nfds = 0;
struct protocol *l;
struct pollfd *fds;
- time_t howlong;
+ struct timespec howlong;
+ struct timespec time_now = { .tv_sec = cur_time, .tv_nsec = 0 };
for (l = protocols; l; l = l->next)
nfds++;
@@ -184,7 +185,7 @@ another:
if (timeouts) {
struct timeout *t;
- if (timeouts->when <= cur_time) {
+ if (timespeccmp(&timeouts->when, &time_now, <=)) {
t = timeouts;
timeouts = timeouts->next;
(*(t->func))(t->what);
@@ -199,10 +200,10 @@ another:
* int for poll, while not polling with a
* negative timeout and blocking indefinitely.
*/
- howlong = timeouts->when - cur_time;
- if (howlong > INT_MAX / 1000)
- howlong = INT_MAX / 1000;
- to_msec = howlong * 1000;
+ timespecsub(&timeouts->when, &time_now, &howlong);
+ if (howlong.tv_sec > INT_MAX / 1000)
+ howlong.tv_sec = INT_MAX / 1000;
+ to_msec = howlong.tv_sec * 1000;
} else
to_msec = -1;
@@ -230,6 +231,7 @@ another:
if (count == -1) {
if (errno == EAGAIN || errno == EINTR) {
time(&cur_time);
+ time_now.tv_sec = cur_time;
continue;
} else
error("poll: %m");
@@ -237,6 +239,7 @@ another:
/* Get the current time... */
time(&cur_time);
+ time_now.tv_sec = cur_time;
i = 0;
for (l = protocols; l; l = l->next) {
@@ -367,7 +370,14 @@ active:
}
void
-add_timeout(time_t when, void (*where)(void *), void *what)
+add_timeout(time_t when_s, void (*where)(void *), void *what)
+{
+ struct timespec when = { .tv_sec = when_s, .tv_nsec = 0 };
+ add_timeout_timespec(when, where, what);
+}
+
+void
+add_timeout_timespec(struct timespec when, void (*where)(void *), void *what)
{
struct timeout *t, *q;
@@ -406,7 +416,7 @@ add_timeout(time_t when, void (*where)(void *), void *what)
/* Now sort this timeout into the timeout list. */
/* Beginning of list? */
- if (!timeouts || timeouts->when > q->when) {
+ if (!timeouts || timespeccmp(&timeouts->when, &q->when, >)) {
q->next = timeouts;
timeouts = q;
return;
@@ -414,7 +424,7 @@ add_timeout(time_t when, void (*where)(void *), void *what)
/* Middle of list? */
for (t = timeouts; t->next; t = t->next) {
- if (t->next->when > q->when) {
+ if (timespeccmp(&t->next->when, &q->when, >)) {
q->next = t->next;
t->next = q;
return;
