BUG/MEDIUM: debug/lua: Use internal hlua function to dump the lua traceback
The commit reverts following commits:
* 83926a04 BUG/MEDIUM: debug/lua: Don't dump the lua stack if not dumpable
* a61789a1 MEDIUM: lua: Use a per-thread counter to track some non-reentrant parts of lua
Instead of relying on a Lua function to print the lua traceback into the
debugger, we are now using our own internal function (hlua_traceback()).
This one does not allocate memory and use a chunk instead. This avoids any
issue with a possible deadlock in the memory allocator because the thread
processing was interrupted during a memory allocation.
This patch relies on the commit "BUG/MEDIUM: debug/lua: Use internal hlua
function to dump the lua traceback". Both must be backported wherever the
patches above are backported, thus as far as 2.0
diff --git a/src/hlua.c b/src/hlua.c
index f3a099e..5f93c7c 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -274,9 +274,6 @@
static struct hlua_mem_allocator hlua_global_allocator THREAD_ALIGNED(64);
- /* > 0 if lua is in a non-rentrant part, thus with a non-dumpable stack */
-THREAD_LOCAL unsigned int hlua_not_dumpable = 0;
-
/* These functions converts types between HAProxy internal args or
* sample and LUA types. Another function permits to check if the
* LUA stack contains arguments according with an required ARG_T
@@ -8635,12 +8632,8 @@
/* a limit of ~0 means unlimited and boot complete, so there's no need
* for accounting anymore.
*/
- if (likely(~zone->limit == 0)) {
- hlua_not_dumpable++;
- ptr = realloc(ptr, nsize);
- hlua_not_dumpable--;
- return ptr;
- }
+ if (likely(~zone->limit == 0))
+ return realloc(ptr, nsize);
if (!ptr)
osize = 0;
@@ -8654,9 +8647,7 @@
return NULL;
} while (!_HA_ATOMIC_CAS(&zone->allocated, &old, new));
- hlua_not_dumpable++;
ptr = realloc(ptr, nsize);
- hlua_not_dumpable--;
if (unlikely(!ptr && nsize)) // failed
_HA_ATOMIC_SUB(&zone->allocated, nsize - osize);