From 5326d6a152e7001c325ce3b00636132f0fb419eb Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Wed, 24 Mar 2021 14:48:45 +0100 Subject: [PATCH] MINOR: lua: Slightly improve function dumping the lua traceback The separator string is now configurable, passing it as parameter when the function is called. In addition, the message have been slightly changed to be a bit more readable. (cherry picked from commit d09cc519bd0c04a0d1ec5bf23ed053c1e596851a) Signed-off-by: Christopher Faulet --- include/haproxy/hlua.h | 1 + src/hlua.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/haproxy/hlua.h b/include/haproxy/hlua.h index 2965625..20b0b45 100644 --- a/include/haproxy/hlua.h +++ b/include/haproxy/hlua.h @@ -43,6 +43,7 @@ #define HLUA_INIT(__hlua) do { (__hlua)->T = 0; } while(0) /* Lua HAProxy integration functions. */ +const char *hlua_traceback(lua_State *L, const char* sep); void hlua_ctx_destroy(struct hlua *lua); void hlua_init(); int hlua_post_init(); diff --git a/src/hlua.c b/src/hlua.c index 990080b..bd0c911 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -286,19 +286,17 @@ const char *hlua_get_top_error_string(lua_State *L) return lua_tostring(L, -1); } -__LJMP static const char *hlua_traceback(lua_State *L) +__LJMP const char *hlua_traceback(lua_State *L, const char* sep) { lua_Debug ar; int level = 0; struct buffer *msg = get_trash_chunk(); - int filled = 0; while (lua_getstack(L, level++, &ar)) { /* Add separator */ - if (filled) - chunk_appendf(msg, ", "); - filled = 1; + if (b_data(msg)) + chunk_appendf(msg, "%s", sep); /* Fill fields: * 'S': fills in the fields source, short_src, linedefined, lastlinedefined, and what; @@ -310,9 +308,9 @@ __LJMP static const char *hlua_traceback(lua_State *L) /* Append code localisation */ if (ar.currentline > 0) - chunk_appendf(msg, "%s:%d ", ar.short_src, ar.currentline); + chunk_appendf(msg, "%s:%d: ", ar.short_src, ar.currentline); else - chunk_appendf(msg, "%s ", ar.short_src); + chunk_appendf(msg, "%s: ", ar.short_src); /* * Get function name @@ -322,13 +320,13 @@ __LJMP static const char *hlua_traceback(lua_State *L) * or "main" for main code. */ if (*ar.namewhat != '\0' && ar.name != NULL) /* is there a name from code? */ - chunk_appendf(msg, "%s '%s'", ar.namewhat, ar.name); /* use it */ + chunk_appendf(msg, "in %s '%s'", ar.namewhat, ar.name); /* use it */ else if (*ar.what == 'm') /* "main", the code is not executed in a function */ - chunk_appendf(msg, "main chunk"); + chunk_appendf(msg, "in main chunk"); else if (*ar.what != 'C') /* for Lua functions, use */ - chunk_appendf(msg, "C function line %d", ar.linedefined); + chunk_appendf(msg, "in function line %d", ar.linedefined); else /* nothing left... */ chunk_appendf(msg, "?"); @@ -1274,7 +1272,7 @@ resume_execution: msg = lua_tostring(lua->T, -1); lua_settop(lua->T, 0); /* Empty the stack. */ lua_pop(lua->T, 1); - trace = hlua_traceback(lua->T); + trace = hlua_traceback(lua->T, ", "); if (msg) lua_pushfstring(lua->T, "runtime error: %s from %s", msg, trace); else -- 1.7.10.4