CLEANUP: hlua: avoid confusion between internal timers and tick based timers
Not all hlua "time" variables use the same time logic.
hlua->wake_time relies on ticks since its meant to be used in conjunction
with task scheduling. Thus, it should be stored as a signed int and
manipulated using the tick api.
Adding a few comments about that to prevent mixups with hlua internal
timer api which doesn't rely on the ticks api.
diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index 22de659..2672ffd 100644
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -116,7 +116,7 @@
-1 if the memory context is not used. */
int nargs; /* The number of arguments in the stack at the start of execution. */
unsigned int flags; /* The current execution flags. */
- int wake_time; /* The lua wants to be waked at this time, or before. */
+ int wake_time; /* The lua wants to be waked at this time, or before. (ticks) */
struct hlua_timer timer; /* lua multipurpose timer */
struct task *task; /* The task associated with the lua stack execution.
We must wake this task to continue the task execution */
diff --git a/src/hlua.c b/src/hlua.c
index bea0cf7..356c04c 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -1369,6 +1369,7 @@
/* This function just ensure that the yield will be always
* returned with a timeout and permit to set some flags
+ * <timeout> is a tick value
*/
__LJMP void hlua_yieldk(lua_State *L, int nresults, int ctx,
lua_KFunction k, int timeout, unsigned int flags)
@@ -8627,7 +8628,7 @@
__LJMP static int hlua_sleep(lua_State *L)
{
unsigned int delay;
- unsigned int wakeup_ms;
+ int wakeup_ms; // tick value
MAY_LJMP(check_args(L, 1, "sleep"));
@@ -8642,7 +8643,7 @@
__LJMP static int hlua_msleep(lua_State *L)
{
unsigned int delay;
- unsigned int wakeup_ms;
+ int wakeup_ms; // tick value
MAY_LJMP(check_args(L, 1, "msleep"));
@@ -9814,7 +9815,7 @@
{
struct hlua *hlua;
unsigned int delay;
- unsigned int wakeup_ms;
+ int wakeup_ms; // tick value
/* Get hlua struct, or NULL if we execute from main lua state */
hlua = hlua_gethlua(L);