From 2de89897498bd3f6eeb8dc130206dc53d3c7efa7 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 8 Feb 2022 00:57:17 +0800 Subject: add signal --- core/src/xmake/engine.c | 71 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 9 deletions(-) (limited to 'core/src') diff --git a/core/src/xmake/engine.c b/core/src/xmake/engine.c index e87fce465..aba443be4 100644 --- a/core/src/xmake/engine.c +++ b/core/src/xmake/engine.c @@ -36,12 +36,15 @@ #elif defined(TB_CONFIG_OS_MACOSX) || defined(TB_CONFIG_OS_IOS) # include # include +# include #elif defined(TB_CONFIG_OS_LINUX) || defined(TB_CONFIG_OS_BSD) || defined(TB_CONFIG_OS_ANDROID) # include +# include #endif #ifdef TB_CONFIG_OS_BSD -# include -# include +# include +# include +# include #endif /* ////////////////////////////////////////////////////////////////////////////////////// @@ -448,6 +451,9 @@ static luaL_Reg const g_tty_functions[] = , { tb_null, tb_null } }; +// the lua global instance for signal handler +static lua_State* g_lua = tb_null; + /* ////////////////////////////////////////////////////////////////////////////////////// * private implementation */ @@ -492,16 +498,14 @@ static tb_bool_t xm_engine_save_arguments(xm_engine_t* engine, tb_int_t argc, tb // _ARGV = table_new lua_setglobal(engine->lua, "_ARGV"); - - // ok return tb_true; } + static tb_size_t xm_engine_get_program_file(xm_engine_t* engine, tb_char_t* path, tb_size_t maxn) { // check tb_assert_and_check_return_val(engine && path && maxn, tb_false); - // done tb_bool_t ok = tb_false; do { @@ -563,16 +567,14 @@ static tb_size_t xm_engine_get_program_file(xm_engine_t* engine, tb_char_t* path lua_pushstring(engine->lua, path); lua_setglobal(engine->lua, "_PROGRAM_FILE"); } - - // ok? return ok; } + static tb_bool_t xm_engine_get_program_directory(xm_engine_t* engine, tb_char_t* path, tb_size_t maxn, tb_char_t const* programfile) { // check tb_assert_and_check_return_val(engine && path && maxn, tb_false); - // done tb_bool_t ok = tb_false; do { @@ -652,12 +654,12 @@ static tb_bool_t xm_engine_get_program_directory(xm_engine_t* engine, tb_char_t* // ok? return ok; } + static tb_bool_t xm_engine_get_project_directory(xm_engine_t* engine, tb_char_t* path, tb_size_t maxn) { // check tb_assert_and_check_return_val(engine && path && maxn, tb_false); - // done tb_bool_t ok = tb_false; do { @@ -688,6 +690,7 @@ static tb_bool_t xm_engine_get_project_directory(xm_engine_t* engine, tb_char_t* // ok? return ok; } + static tb_void_t xm_engine_init_host(xm_engine_t* engine) { // check @@ -733,6 +736,7 @@ static tb_void_t xm_engine_init_host(xm_engine_t* engine) lua_pushstring(engine->lua, subhost? subhost : "unknown"); lua_setglobal(engine->lua, "_SUBHOST"); } + static tb_void_t xm_engine_init_arch(xm_engine_t* engine) { // check @@ -803,6 +807,7 @@ static tb_void_t xm_engine_init_arch(xm_engine_t* engine) lua_pushstring(engine->lua, subarch); lua_setglobal(engine->lua, "_SUBARCH"); } + static tb_void_t xm_engine_init_features(xm_engine_t* engine) { // check @@ -832,6 +837,51 @@ static tb_void_t xm_engine_init_features(xm_engine_t* engine) lua_setglobal(engine->lua, "_FEATURES"); } +#if defined(TB_CONFIG_OS_WINDOWS) +static BOOL WINAPI xm_engine_signal_handler(tb_int_t signo) +{ + if (signo == CTRL_C_EVENT) + { + tb_trace_i("signal: %d", signo); + tb_abort(); + } + return TRUE; +} +#elif defined(SIGINT) +static tb_void_t xm_engine_signal_handler(tb_int_t signo) +{ + if (signo == SIGINT) + { + tb_trace_i("signal: %d", signo); +#if 0 + lua_getfield(lua, 1, "debug"); + lua_pushvalue(lua, -2); + lua_pushvalue(lua, 1); + if (lua_pcall(lua, 2, 0, 0) != 0) + { + tb_printl(lua_pushfstring(lua, "error calling " LUA_QL("$interactive_setfenv") " (%s)", lua_tostring(lua, -1))); + } +#endif + tb_abort(); + } +} +#endif + +static tb_void_t xm_engine_init_signal(xm_engine_t* engine) +{ + // we enable it to catch the current lua stack in ctrl-c signal handler if XMAKE_PROFILE=stuck + tb_char_t data[64] = {0}; + if (!tb_environment_first("XMAKE_PROFILE", data, sizeof(data)) || tb_strcmp(data, "stuck")) + return ; + + g_lua = engine->lua; +#if defined(TB_CONFIG_OS_WINDOWS) + SetConsoleCtrlHandler(xm_engine_signal_handler, TRUE); +#elif defined(SIGINT) + signal(SIGINT, xm_engine_signal_handler); +#endif +} + /* ////////////////////////////////////////////////////////////////////////////////////// * implementation */ @@ -915,6 +965,9 @@ xm_engine_ref_t xm_engine_init(tb_char_t const* name, xm_engine_lni_initalizer_c // init features xm_engine_init_features(engine); + // init signal + xm_engine_init_signal(engine); + // get version tb_version_t const* version = xm_version(); tb_assert_and_check_break(version); -- cgit v1.3.1 From 26af8f1eb23348c435bf535522e220a7c8b02af6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 8 Feb 2022 22:41:02 +0800 Subject: debug stuck backtrace --- core/src/xmake/engine.c | 65 +++++++++++++++++++++------------------ xmake/core/base/coroutine.lua | 6 ---- xmake/plugins/show/lists/envs.lua | 2 +- 3 files changed, 36 insertions(+), 37 deletions(-) (limited to 'core/src') diff --git a/core/src/xmake/engine.c b/core/src/xmake/engine.c index aba443be4..86f902580 100644 --- a/core/src/xmake/engine.c +++ b/core/src/xmake/engine.c @@ -691,6 +691,41 @@ static tb_bool_t xm_engine_get_project_directory(xm_engine_t* engine, tb_char_t* return ok; } +#if defined(TB_CONFIG_OS_WINDOWS) || defined(SIGINT) +static tb_void_t xm_engine_dump_traceback(lua_State* lua) +{ + // @note it's not safe, but it doesn't matter, we're just trying to get the stack backtrace for debugging + lua_getglobal(lua, "debug"); + lua_getfield(lua, -1, "traceback"); + lua_replace(lua, -2); + lua_pushvalue(lua, 1); + lua_pushinteger(lua, 2); + lua_call(lua, 2, 1); + tb_trace_i("%s", lua_tostring(lua, -1)); +} +#endif + +#if defined(TB_CONFIG_OS_WINDOWS) +static BOOL WINAPI xm_engine_signal_handler(DWORD signo) +{ + if (signo == CTRL_C_EVENT && g_lua) + { + xm_engine_dump_traceback(g_lua); + tb_abort(); + } + return TRUE; +} +#elif defined(SIGINT) +static tb_void_t xm_engine_signal_handler(tb_int_t signo) +{ + if (signo == SIGINT && g_lua) + { + xm_engine_dump_traceback(g_lua); + tb_abort(); + } +} +#endif + static tb_void_t xm_engine_init_host(xm_engine_t* engine) { // check @@ -837,36 +872,6 @@ static tb_void_t xm_engine_init_features(xm_engine_t* engine) lua_setglobal(engine->lua, "_FEATURES"); } -#if defined(TB_CONFIG_OS_WINDOWS) -static BOOL WINAPI xm_engine_signal_handler(tb_int_t signo) -{ - if (signo == CTRL_C_EVENT) - { - tb_trace_i("signal: %d", signo); - tb_abort(); - } - return TRUE; -} -#elif defined(SIGINT) -static tb_void_t xm_engine_signal_handler(tb_int_t signo) -{ - if (signo == SIGINT) - { - tb_trace_i("signal: %d", signo); -#if 0 - lua_getfield(lua, 1, "debug"); - lua_pushvalue(lua, -2); - lua_pushvalue(lua, 1); - if (lua_pcall(lua, 2, 0, 0) != 0) - { - tb_printl(lua_pushfstring(lua, "error calling " LUA_QL("$interactive_setfenv") " (%s)", lua_tostring(lua, -1))); - } -#endif - tb_abort(); - } -} -#endif - static tb_void_t xm_engine_init_signal(xm_engine_t* engine) { // we enable it to catch the current lua stack in ctrl-c signal handler if XMAKE_PROFILE=stuck diff --git a/xmake/core/base/coroutine.lua b/xmake/core/base/coroutine.lua index 2f1c347a8..43a5d6d8a 100644 --- a/xmake/core/base/coroutine.lua +++ b/xmake/core/base/coroutine.lua @@ -31,8 +31,6 @@ coroutine._resume = coroutine._resume or coroutine.resume -- resume coroutine function coroutine.resume(co, ...) - - -- resume it local ok, results = coroutine._resume(co, ...) if not ok then @@ -47,12 +45,8 @@ function coroutine.resume(co, ...) errors = results:sub(pos + 1) end end - - -- failed return false, errors end - - -- ok return true, results end diff --git a/xmake/plugins/show/lists/envs.lua b/xmake/plugins/show/lists/envs.lua index 4092901fa..8e66db1e8 100644 --- a/xmake/plugins/show/lists/envs.lua +++ b/xmake/plugins/show/lists/envs.lua @@ -36,7 +36,7 @@ function main() XMAKE_RAMDIR = {"Set the ramdisk directory.", os.getenv("XMAKE_RAMDIR")}, XMAKE_RCFILES = {"Set the runtime configuration files.", path.joinenv(project.rcfiles())}, XMAKE_TMPDIR = {"Set the temporary directory.", os.tmpdir()}, - XMAKE_PROFILE = {"Start profiler, e.g. perf, trace.", os.getenv("XMAKE_PROFILE")}, + XMAKE_PROFILE = {"Start profiler, e.g. perf, trace, stuck.", os.getenv("XMAKE_PROFILE")}, XMAKE_PKG_CACHEDIR = {"Set the cache directory of packages.", os.getenv("XMAKE_PKG_CACHEDIR")}, XMAKE_PKG_INSTALLDIR = {"Set the install directory of packages.", os.getenv("XMAKE_PACKAGEDIR")}} local width = 24 -- cgit v1.3.1 From 41122c0c4597ae3b50a9d2479e348b9c542d7066 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 8 Feb 2022 22:43:40 +0800 Subject: fix dump --- core/src/xmake/engine.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core/src') diff --git a/core/src/xmake/engine.c b/core/src/xmake/engine.c index 86f902580..efc89977c 100644 --- a/core/src/xmake/engine.c +++ b/core/src/xmake/engine.c @@ -699,8 +699,7 @@ static tb_void_t xm_engine_dump_traceback(lua_State* lua) lua_getfield(lua, -1, "traceback"); lua_replace(lua, -2); lua_pushvalue(lua, 1); - lua_pushinteger(lua, 2); - lua_call(lua, 2, 1); + lua_call(lua, 1, 1); tb_trace_i("%s", lua_tostring(lua, -1)); } #endif -- cgit v1.3.1