luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-05-04 10:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move to lazy interrupt handler setting

Browse source
This commit is contained in:
Jay Kruer 2022-06-17 16:57:34 -07:00
parent 289d95e8da
commit d3045d21bc
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CLI/Repl.cpp
View file

@ -48,9 +48,15 @@ constexpr int MaxTraversalLimit = 50;
// Ctrl-C handling // Ctrl-C handling
#ifndef _WIN32 #ifndef _WIN32
volatile sig_atomic_t sigint_received = 0; void sigint_callback(lua_State* L, int k) {
lua_callbacks(L)->interrupt = NULL;
luaL_error(L, "Execution interrupted");
};
lua_State* repl_lua_state = NULL;
static void handle_sig(int signum) { static void handle_sig(int signum) {
sigint_received = 1; if(repl_lua_state != NULL) {
lua_callbacks(repl_lua_state)->interrupt = &sigint_callback;
}
} }
#endif #endif
@ -497,17 +503,6 @@ static void runReplImpl(lua_State* L)
} }
} }
#ifndef _WIN32
#include <stdexcept>
void ihandler(lua_State* L, int k) {
if (sigint_received) {
sigint_received = 0;
std::runtime_error error("Execution interrupted");
throw error;
}
};
#endif
static void runRepl() static void runRepl()
{ {
std::unique_ptr<lua_State, void (*)(lua_State*)> globalState(luaL_newstate(), lua_close); std::unique_ptr<lua_State, void (*)(lua_State*)> globalState(luaL_newstate(), lua_close);
@ -517,8 +512,8 @@ static void runRepl()
// FIXME: add corresponding windows functionality // FIXME: add corresponding windows functionality
#ifndef _WIN32 #ifndef _WIN32
repl_lua_state = L;
signal(SIGINT, handle_sig); signal(SIGINT, handle_sig);
lua_callbacks(L)->interrupt = &ihandler;
#endif #endif
luaL_sandboxthread(L); luaL_sandboxthread(L);