From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <tarantool-patches-bounces@dev.tarantool.org>
Received: from [87.239.111.99] (localhost [127.0.0.1])
by dev.tarantool.org (Postfix) with ESMTP id 74E5D6EC40;
Thu, 1 Jul 2021 23:28:46 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 74E5D6EC40
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev;
t=1625171326; bh=QsDm35pClHZo0t0JJtHUta7XqrnB8y0gLNTqLCP1wXo=;
h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:
List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:
From;
b=E9tzwTZwJFbNJTcBOI2vQnC8+To1gzttxT1tvPo/jBKLa5Ak9APIBqerztuSpbkEW
+74eK746Zh3pvJrprhgdj791EFosdKqorlr6MfvSSdqpm8dtstR2ku/ORFble/fw9C
C7u6vdWNwi0xKFUBpMJLycbBneWFN0HiGg91UAoA=
Received: from smtp60.i.mail.ru (smtp60.i.mail.ru [217.69.128.40])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dev.tarantool.org (Postfix) with ESMTPS id BB0CC6EC40
for <tarantool-patches@dev.tarantool.org>;
Thu, 1 Jul 2021 23:25:53 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BB0CC6EC40
Received: by smtp60.i.mail.ru with esmtpa (envelope-from
<eelchinov@tarantool.org>)
id 1lz3Fw-0006gg-C5; Thu, 01 Jul 2021 23:25:52 +0300
To: gorcunov@tarantool.org,
alyapunov@tarantool.org,
skaplun@tarantool.org
Date: Thu, 1 Jul 2021 23:24:44 +0300
Message-Id: <c76380462ce397be29fea15f42143c796ca98d7f.1625170992.git.elchinov.es@gmail.com>
X-Mailer: git-send-email 2.31.1
In-Reply-To: <cover.1625170992.git.elchinov.es@gmail.com>
References: <cover.1625170992.git.elchinov.es@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-7564579A: 78E4E2B564C1792B
X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB703477AD6D36A6E3513B6A65BE508F5F182A05F538085040314F4D5A26D80E604D25581A54C3DE01A8B5D1732B5F31AC9038FCC46BAE1C7C
X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AC4684DF4EC4B256EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375189E43B47FB350A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D839F0B5F9BFDD2A1612F00EF8A2AD921B117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE38D4DC57D478E688E0F2381F647739FAD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE364A52DF3AE21010F6E0066C2D8992A16C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F79006379FC65886B7F75608EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A
X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D25379311020FFC8D4ADD39CE08E0D58FA78653C78CA8525D07D
X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBCA6440478D4BA467213575F29C1EBDE6F5875E60D10B3339C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCCE3E035A672CDEE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356
X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D344888A9AABCDD3225336B94A5DC3F27D6EB602EBA48C8342AEC904C94DF22F333FBD7E7EABA44F4CC1D7E09C32AA3244CAE9CE85E7F88C94C8D1D2496D843D11605AB220A9D022EBC83B48618A63566E0
X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXhQbJZ+TAeEv9/3q7dCnrgR
X-Mailru-Sender: EFA0F3A8419EF2166B053C73E674FFD56A619EA22EF64283F66A60C73379D10FE2527C969975515C67F54F2D6EFFC80BC77752E0C033A69E17841C44D9B5D58765F2F89A5AFDB6F16C18EFA0BB12DBB0
X-Mras: Ok
Subject: [Tarantool-patches] [PATCH 6/7] fiber: refactor lua backtrace
routine
X-BeenThere: tarantool-patches@dev.tarantool.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
From: Egor Elchinov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
Reply-To: eelchinov@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Errors-To: tarantool-patches-bounces@dev.tarantool.org
Sender: "Tarantool-patches" <tarantool-patches-bounces@dev.tarantool.org>
From: Egor Elchinov <eelchinov@tarantool.org>
From: Egor Elchinov <elchinov.es@gmail.com>
Lua backtrace with callback moved to new routine
`lua_backtrace_cb()` similar to the `backtrace_cb()`
for C backtrace.
Needed for: #4002
---
src/lua/fiber.c | 165 +++++++++++++++++++++---------------------------
1 file changed, 73 insertions(+), 92 deletions(-)
diff --git a/src/lua/fiber.c b/src/lua/fiber.c
index fe01ae23b..9e0c33a8f 100644
--- a/src/lua/fiber.c
+++ b/src/lua/fiber.c
@@ -205,14 +205,17 @@ struct lua_parent_tb_ctx {
int tb_frame;
};
+/** Lua backtrace callback type */
+typedef int (lua_backtrace_cb)(struct lua_Debug *ar, int frame_no, void *cb_ctx);
+
#if ENABLE_BACKTRACE
static void
-dump_lua_frame(struct lua_State *L, lua_Debug *ar, int tb_frame)
+dump_lua_frame(struct lua_State *L, const char *name, const char *src, int line,
+ int tb_frame)
{
char buf[512];
snprintf(buf, sizeof(buf), "%s in %s at line %i",
- ar->name != NULL ? ar->name : "(unnamed)",
- ar->source, ar->currentline);
+ name != NULL ? name : "(unnamed)", src, line);
lua_pushnumber(L, tb_frame);
lua_newtable(L);
lua_pushstring(L, "L");
@@ -221,20 +224,65 @@ dump_lua_frame(struct lua_State *L, lua_Debug *ar, int tb_frame)
lua_settable(L, -3);
}
+static int
+dump_lua_frame_cb(lua_Debug *ar, int tb_frame, void *cb_ctx)
+{
+ (void) tb_frame;
+ struct lua_fiber_tb_ctx *tb_ctx = (struct lua_fiber_tb_ctx *)cb_ctx;
+
+ tb_ctx->tb_frame++;
+ dump_lua_frame(tb_ctx->L, ar->name, ar->source, ar->currentline,
+ tb_ctx->tb_frame);
+
+ return 0;
+}
+
+static int
+save_lua_frame_cb(lua_Debug *ar, int tb_frame, void *cb_ctx)
+{
+ struct parent_bt_lua *bt = (struct parent_bt_lua *)cb_ctx;
+
+ if (tb_frame >= PARENT_BT_LUA_LEN_MAX)
+ return 1;
+
+ bt->cnt++;
+ bt->lines[tb_frame] = ar->currentline;
+ strncpy(bt->names[tb_frame], ar->name == NULL ? "(unnamed)" : ar->name,
+ PARENT_BT_LUA_NAME_MAX - 1);
+ strncpy(bt->sources[tb_frame], ar->source,
+ PARENT_BT_LUA_NAME_MAX - 1);
+
+ return 0;
+}
+
static void
-dump_parent_lua_frame(struct lua_State *L, const char *name, const char *src,
- int currentline, int tb_frame)
+lua_backtrace_foreach(struct lua_State *L, lua_backtrace_cb cb, void *cb_ctx)
{
- char buf[512];
- snprintf(buf, sizeof(buf), "%s in %s at line %i",
- name != NULL ? name : "(unnamed)",
- src, currentline);
- lua_pushnumber(L, tb_frame);
- lua_newtable(L);
- lua_pushstring(L, "L");
- lua_pushstring(L, buf);
- lua_settable(L, -3);
- lua_settable(L, -3);
+ int lua_frame = 0, tb_frame = 0;
+ lua_Debug ar;
+ while (lua_getstack(L, lua_frame, &ar) > 0) {
+ /* Skip all following C-frames. */
+ lua_getinfo(L, "Sln", &ar);
+ if (*ar.what != 'C')
+ break;
+ if (ar.name != NULL) {
+ /* Dump frame if it is a C built-in call. */
+ if (cb(&ar, tb_frame, cb_ctx) != 0)
+ return;
+ tb_frame++;
+ }
+ lua_frame++;
+ }
+ while (lua_getstack(L, lua_frame, &ar) > 0) {
+ /* Trace Lua frame. */
+ lua_getinfo(L, "Sln", &ar);
+ if (*ar.what == 'C')
+ break;
+ if (cb(&ar, tb_frame, cb_ctx) != 0)
+ return;
+ tb_frame++;
+ lua_frame++;
+ }
}
static int
@@ -247,31 +295,9 @@ fiber_backtrace_cb(int frameno, void *frameret, const char *func, size_t offset,
* https://github.com/tarantool/tarantool/issues/5326
* will not resolved, but is possible afterwards.
*/
- if (func != NULL && strstr(func, "lj_BC_FUNCC") == func) {
+ if (func != NULL && tb_ctx->R && strstr(func, "lj_BC_FUNCC") == func) {
/* We are in the LUA vm. */
- lua_Debug ar;
- while (tb_ctx->R && lua_getstack(tb_ctx->R, tb_ctx->lua_frame, &ar) > 0) {
- /* Skip all following C-frames. */
- lua_getinfo(tb_ctx->R, "Sln", &ar);
- if (*ar.what != 'C')
- break;
- if (ar.name != NULL) {
- /* Dump frame if it is a C built-in call. */
- tb_ctx->tb_frame++;
- dump_lua_frame(L, &ar, tb_ctx->tb_frame);
- }
- tb_ctx->lua_frame++;
- }
- while (tb_ctx->R && lua_getstack(tb_ctx->R, tb_ctx->lua_frame, &ar) > 0) {
- /* Trace Lua frame. */
- lua_getinfo(tb_ctx->R, "Sln", &ar);
- if (*ar.what == 'C') {
- break;
- }
- tb_ctx->tb_frame++;
- dump_lua_frame(L, &ar, tb_ctx->tb_frame);
- tb_ctx->lua_frame++;
- }
+ lua_backtrace_foreach(tb_ctx->R, dump_lua_frame_cb, tb_ctx);
}
char buf[512];
int l = snprintf(buf, sizeof(buf), "#%-2d %p in ", frameno, frameret);
@@ -306,10 +332,10 @@ fiber_parent_backtrace_cb(int frameno, void *frameret, const char *func,
/* We are in the LUA vm. */
while (lua_frame < bt->cnt) {
tb_ctx->tb_frame++;
- dump_parent_lua_frame(L, bt->names[lua_frame],
- bt->sources[lua_frame],
- bt->lines[lua_frame],
- tb_ctx->tb_frame);
+ dump_lua_frame(L, bt->names[lua_frame],
+ bt->sources[lua_frame],
+ bt->lines[lua_frame],
+ tb_ctx->tb_frame);
lua_frame++;
}
}
@@ -332,60 +358,15 @@ fiber_parent_backtrace_cb(int frameno, void *frameret, const char *func,
static int
fiber_parent_bt_init(struct fiber *f, struct lua_State *L)
{
- int lua_frame = 0, tb_frame = 0;
- lua_Debug ar;
struct parent_bt_lua *bt = NULL;
-
- bt = (struct parent_bt_lua *)malloc(sizeof(*bt));
+ bt = (struct parent_bt_lua *)calloc(1, sizeof(*bt));
if (bt == NULL){
- diag_set(OutOfMemory, sizeof(*bt), "malloc", "bt");
+ diag_set(OutOfMemory, sizeof(*bt), "calloc", "bt");
return 1;
}
- while (tb_frame < PARENT_BT_LUA_LEN_MAX &&
- lua_getstack(L, lua_frame, &ar) > 0) {
- /* Skip all following C-frames. */
- lua_getinfo(L, "Sln", &ar);
- if (*ar.what != 'C')
- break;
- if (ar.name != NULL) {
- /* Dump frame if it is a C built-in call. */
- bt->lines[tb_frame] = ar.currentline;
- memset(bt->names[tb_frame], 0,
- PARENT_BT_LUA_NAME_MAX);
- strncpy(bt->names[tb_frame], ar.name,
- PARENT_BT_LUA_NAME_MAX - 1);
- memset(bt->sources[tb_frame], 0,
- PARENT_BT_LUA_NAME_MAX);
- strncpy(bt->sources[tb_frame], ar.source,
- PARENT_BT_LUA_NAME_MAX - 1);
- tb_frame++;
- }
- lua_frame++;
- }
- while (tb_frame < PARENT_BT_LUA_LEN_MAX &&
- lua_getstack(L, lua_frame, &ar) > 0) {
- /* Trace Lua frame. */
- lua_getinfo(L, "Sln", &ar);
- if (*ar.what == 'C')
- break;
- bt->lines[tb_frame] = ar.currentline;
- memset(bt->names[tb_frame], 0, PARENT_BT_LUA_NAME_MAX);
- if (ar.name != NULL) {
- strncpy(bt->names[tb_frame], ar.name,
- PARENT_BT_LUA_NAME_MAX - 1);
- } else {
- strncpy(bt->names[tb_frame], "(unnamed)",
- PARENT_BT_LUA_NAME_MAX - 1);
- }
- memset(bt->sources[tb_frame], 0, PARENT_BT_LUA_NAME_MAX);
- strncpy(bt->sources[tb_frame], ar.source,
- PARENT_BT_LUA_NAME_MAX - 1);
- tb_frame++;
- lua_frame++;
- }
-
- bt->cnt = tb_frame;
+ bt->cnt = 0;
+ lua_backtrace_foreach(L, save_lua_frame_cb, bt);
f->storage.lua.parent_bt = bt;
return 0;
--
2.31.1