Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add SIGINT support for _WIN32 environments #120

Merged
merged 2 commits into from
Mar 15, 2023
Merged

add SIGINT support for _WIN32 environments #120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570e4ff
add SIGINT support for _WIN32 environments
bitRAKE Mar 14, 2023
5854319
perhaps more consistent
bitRAKE Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
#include <signal.h>
#include <unistd.h>
#elif defined (_WIN32)
#include <signal.h>
#endif

#define ANSI_COLOR_RED "\x1b[31m"
Expand Down Expand Up @@ -753,7 +755,7 @@ bool llama_eval(

static bool is_interacting = false;

#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) || defined (_WIN32)
void sigint_handler(int signo) {
if (signo == SIGINT) {
if (!is_interacting) {
Expand Down Expand Up @@ -863,6 +865,8 @@ int main(int argc, char ** argv) {
sigemptyset (&sigint_action.sa_mask);
sigint_action.sa_flags = 0;
sigaction(SIGINT, &sigint_action, NULL);
#elif defined (_WIN32)
signal(SIGINT, sigint_handler);
#endif

fprintf(stderr, "%s: interactive mode on.\n", __func__);
Expand Down Expand Up @@ -892,7 +896,7 @@ int main(int argc, char ** argv) {

if (params.interactive) {
fprintf(stderr, "== Running in interactive mode. ==\n"
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) || defined (_WIN32)
" - Press Ctrl+C to interject at any time.\n"
#endif
" - Press Return to return control to LLaMa.\n"
Expand Down Expand Up @@ -1037,6 +1041,9 @@ int main(int argc, char ** argv) {
}
}

#if defined (_WIN32)
signal(SIGINT, SIG_DFL);
#endif

// report timing
{
Expand Down