From 5f4799d8cfd5d8e8b2063102f0a169c70977fa83 Mon Sep 17 00:00:00 2001 From: Bruno Silvestre Date: Thu, 31 Aug 2023 10:51:50 -0300 Subject: [PATCH] reset block timeout at send or receive Addressing #159 and #160 --- src/luasocket/buffer.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/luasocket/buffer.c b/src/luasocket/buffer.c index e1ae981..0eaac41 100644 --- a/src/luasocket/buffer.c +++ b/src/luasocket/buffer.c @@ -78,9 +78,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) { const char *data = luaL_checklstring(L, 2, &size); long start = (long) luaL_optnumber(L, 3, 1); long end = (long) luaL_optnumber(L, 4, -1); -#ifdef LUASOCKET_DEBUG - p_timeout tm = timeout_markstart(buf->tm); -#endif + timeout_markstart(buf->tm); if (start < 0) start = (long) (size+start+1); if (end < 0) end = (long) (size+end+1); if (start < 1) start = (long) 1; @@ -98,7 +96,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) { } #ifdef LUASOCKET_DEBUG /* push time elapsed during operation as the last return value */ - lua_pushnumber(L, timeout_gettime() - timeout_getstart(tm)); + lua_pushnumber(L, timeout_gettime() - timeout_getstart(buf->tm)); #endif return lua_gettop(L) - top; } @@ -117,9 +115,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) { top = 3; } part = luaL_optlstring(L, 3, "", &size); -#ifdef LUASOCKET_DEBUG - p_timeout tm = timeout_markstart(buf->tm); -#endif + timeout_markstart(buf->tm); /* initialize buffer with optional extra prefix * (useful for concatenating previous partial results) */ luaL_buffinit(L, &b); @@ -155,7 +151,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) { } #ifdef LUASOCKET_DEBUG /* push time elapsed during operation as the last return value */ - lua_pushnumber(L, timeout_gettime() - timeout_getstart(tm)); + lua_pushnumber(L, timeout_gettime() - timeout_getstart(buf->tm)); #endif return lua_gettop(L) - top; }