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/debug.c b/src/debug.c
index 9346828..7f004df 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -264,13 +264,9 @@
}
if (hlua && hlua->T) {
- if (hlua_not_dumpable == 0) {
- luaL_traceback(hlua->T, hlua->T, NULL, 0);
- if (!append_prefixed_str(buf, lua_tostring(hlua->T, -1), pfx, '\n', 1))
- b_putchr(buf, '\n');
- }
- else
- chunk_appendf(buf, "Inside non-rentrant part, Stack traceback not available\n");
+ chunk_appendf(buf, "stack traceback:\n ");
+ append_prefixed_str(buf, hlua_traceback(hlua->T, "\n "), pfx, '\n', 0);
+ b_putchr(buf, '\n');
}
else
b_putchr(buf, '\n');