RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:57:35 +00:00
Code Issues Activity Actions

js: Interrupt running script or REPL evaluation when receiving SIGINT

Browse source
This commit is contained in:
Linus Groh 2020-04-24 17:59:16 +01:00 • committed by Andreas Kling
parent c350bb9178
commit a832ab0f4e
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/js.cpp
View file

@ -383,6 +383,12 @@ void enable_test_mode(JS::Interpreter& interpreter)
interpreter.global_object().put_native_function("load", ReplObject::load_file); interpreter.global_object().put_native_function("load", ReplObject::load_file);
} }
static Function<void()> interrupt_interpreter;
void sigint_handler()
{
interrupt_interpreter();
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
bool gc_on_every_allocation = false; bool gc_on_every_allocation = false;
@ -399,8 +405,15 @@ int main(int argc, char** argv)
args_parser.add_positional_argument(script_path, "Path to script file", "script", Core::ArgsParser::Required::No); args_parser.add_positional_argument(script_path, "Path to script file", "script", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
OwnPtr<JS::Interpreter> interpreter;
interrupt_interpreter = [&] {
auto error = JS::Error::create(interpreter->global_object(), "Error", "Received SIGINT");
interpreter->throw_exception(error);
};
if (script_path == nullptr) { if (script_path == nullptr) {
auto interpreter = JS::Interpreter::create<ReplObject>(); interpreter = JS::Interpreter::create<ReplObject>();
interpreter->heap().set_should_collect_on_every_allocation(gc_on_every_allocation); interpreter->heap().set_should_collect_on_every_allocation(gc_on_every_allocation);
if (test_mode) if (test_mode)
enable_test_mode(*interpreter); enable_test_mode(*interpreter);
@ -408,6 +421,7 @@ int main(int argc, char** argv)
editor = make<Line::Editor>(); editor = make<Line::Editor>();
signal(SIGINT, [](int) { signal(SIGINT, [](int) {
sigint_handler();
editor->interrupted(); editor->interrupted();
}); });
@ -620,11 +634,15 @@ int main(int argc, char** argv)
editor->on_tab_complete_other_token = [complete](auto& value) { return complete(value); }; editor->on_tab_complete_other_token = [complete](auto& value) { return complete(value); };
repl(*interpreter); repl(*interpreter);
} else { } else {
auto interpreter = JS::Interpreter::create<JS::GlobalObject>(); interpreter = JS::Interpreter::create<JS::GlobalObject>();
interpreter->heap().set_should_collect_on_every_allocation(gc_on_every_allocation); interpreter->heap().set_should_collect_on_every_allocation(gc_on_every_allocation);
if (test_mode) if (test_mode)
enable_test_mode(*interpreter); enable_test_mode(*interpreter);
signal(SIGINT, [](int) {
sigint_handler();
});
auto file = Core::File::construct(script_path); auto file = Core::File::construct(script_path);
if (!file->open(Core::IODevice::ReadOnly)) { if (!file->open(Core::IODevice::ReadOnly)) {
fprintf(stderr, "Failed to open %s: %s\n", script_path, file->error_string()); fprintf(stderr, "Failed to open %s: %s\n", script_path, file->error_string());