[master] 809426564 vtim: VTIM_timeval() for socket timeouts

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Mar 5 08:53:09 UTC 2024


commit 80942656483b7b4b183ea5787f45d7f9f6586116
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Feb 29 12:30:09 2024 +0100

    vtim: VTIM_timeval() for socket timeouts

diff --git a/include/vtim.h b/include/vtim.h
index 042feedb1..9652238c0 100644
--- a/include/vtim.h
+++ b/include/vtim.h
@@ -40,4 +40,5 @@ vtim_real VTIM_real(void);
 void VTIM_sleep(vtim_dur t);
 struct timespec VTIM_timespec(vtim_dur t);
 struct timeval VTIM_timeval(vtim_dur t);
+struct timeval VTIM_timeval_sock(vtim_dur t);
 int VTIM_poll_tmo(vtim_dur);
diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index 33907432a..7485acb2e 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -454,6 +454,13 @@ VTIM_timespec(vtim_dur t)
 	return (tv);
 }
 
+struct timeval
+VTIM_timeval_sock(vtim_dur t)
+{
+
+	return (VTIM_timeval(isinf(t) ? 0. : vmax(t, 1e-3)));
+}
+
 int
 VTIM_poll_tmo(vtim_dur tmo)
 {


More information about the varnish-commit mailing list