mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: lua: fix extra 500ms added to socket timeouts

Browse Source 
Since commit #56cc12509, haproxy accepts double values for timeouts. The
value is then converted to  milliseconds before being rounded up and cast
to int. The issue is that to round up the value, a constant value of 0.5
is added to it, but too early in the conversion, resulting in an
additional 500ms to the value. We are talking about a precision of 1ms,
so we can safely get rid of this rounding trick and adjust resulting
timeouts equal to 0 to a minimum of 1ms.

This patch is specific to the 1.9 branch and doesn't require to be
backported.
This commit is contained in:
Cyril Bont 2018-08-19 22:08:50 +02:00 committed by Willy Tarreau
parent 7bb6345497
commit 7ee465f1ad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -2545,17 +2545,19 @@ __LJMP static int hlua_socket_settimeout(struct lua_State *L)
socket = MAY_LJMP(hlua_checksocket(L, 1)); socket = MAY_LJMP(hlua_checksocket(L, 1));
/* round up for inputs that are fractions and convert to millis */ /* convert the timeout to millis */
dtmout = (0.5 + MAY_LJMP(luaL_checknumber(L, 2))) * 1000; dtmout = MAY_LJMP(luaL_checknumber(L, 2)) * 1000;
/* Check for negative values */ /* Check for negative values */
if (dtmout < 0) if (dtmout < 0)
WILL_LJMP(luaL_error(L, "settimeout: cannot set negatives values")); WILL_LJMP(luaL_error(L, "settimeout: cannot set negatives values"));
if (dtmout > INT_MAX) /* overflow check */ if (dtmout > INT_MAX) /* overflow check */
WILL_LJMP(luaL_error(L, "settimeout: cannot set values larger than %d", INT_MAX)); WILL_LJMP(luaL_error(L, "settimeout: cannot set values larger than %d ms", INT_MAX));
tmout = MS_TO_TICKS((int)dtmout); tmout = MS_TO_TICKS((int)dtmout);
if (tmout == 0)
tmout++; /* very small timeouts are adjusted to a minium of 1ms */
/* Check if we run on the same thread than the xreator thread. /* Check if we run on the same thread than the xreator thread.
* We cannot access to the socket if the thread is different. * We cannot access to the socket if the thread is different.