gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-04-19 13:33:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve CLI signal handling on POSIX.

Browse Source
This commit is contained in:
Mike Pall 2025-03-09 15:50:01 +01:00
parent 54dc2fa5d7
commit 423ac2144b
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/luajit.c
View File

@ -35,6 +35,21 @@
#if !LJ_TARGET_CONSOLE #if !LJ_TARGET_CONSOLE
#include <signal.h> #include <signal.h>
#if LJ_TARGET_POSIX
/* Improve signal handling on POSIX. Try CTRL-C on: luajit -e 'io.read()' */
static void signal_set(int sig, void (*h)(int))
{
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
sa.sa_handler = h;
sigemptyset(&sa.sa_mask);
sigaction(sig, &sa, NULL);
}
#else
#define signal_set signal
#endif
#endif #endif
static lua_State *globalL = NULL; static lua_State *globalL = NULL;
@ -54,8 +69,8 @@ static void lstop(lua_State *L, lua_Debug *ar)
static void laction(int i) static void laction(int i)
{ {
signal(i, SIG_DFL); /* if another SIGINT happens before lstop, /* Terminate process if another SIGINT happens (double CTRL-C). */
terminate process (default action) */ signal_set(i, SIG_DFL);
lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1); lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
} }
#endif #endif
@ -117,11 +132,11 @@ static int docall(lua_State *L, int narg, int clear)
lua_pushcfunction(L, traceback); /* push traceback function */ lua_pushcfunction(L, traceback); /* push traceback function */
lua_insert(L, base); /* put it under chunk and args */ lua_insert(L, base); /* put it under chunk and args */
#if !LJ_TARGET_CONSOLE #if !LJ_TARGET_CONSOLE
signal(SIGINT, laction); signal_set(SIGINT, laction);
#endif #endif
status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base); status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base);
#if !LJ_TARGET_CONSOLE #if !LJ_TARGET_CONSOLE
signal(SIGINT, SIG_DFL); signal_set(SIGINT, SIG_DFL);
#endif #endif
lua_remove(L, base); /* remove traceback function */ lua_remove(L, base); /* remove traceback function */
/* force a complete garbage collection in case of errors */ /* force a complete garbage collection in case of errors */