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

Jump to bottom

Server: Hit Ctrl+C twice to exit #5734

Merged
merged 6 commits into from
Feb 28, 2024
Merged

Server: Hit Ctrl+C twice to exit #5734

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7547ef5
server: twice ctrl+C to exit
ngxson Feb 26, 2024
273d985
std::atomic_flag
ngxson Feb 26, 2024
66c7480
Merge branch 'master' into xsn/server_twice_ctrl_c
ngxson Feb 27, 2024
ac69999
sigint: message
ngxson Feb 27, 2024
88f5ae3
sigint: stderr
ngxson Feb 27, 2024
0fcd27d
Update examples/server/server.cpp
ngxson Feb 27, 2024
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: 10 additions & 1 deletion examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2772,7 +2772,16 @@ static void append_to_generated_text_from_generated_token_probs(llama_server_con
}

std::function<void(int)> shutdown_handler;
inline void signal_handler(int signal) { shutdown_handler(signal); }
std::atomic_flag is_terminating = ATOMIC_FLAG_INIT;
inline void signal_handler(int signal) {
if (is_terminating.test_and_set()) {
// in case it hangs, we can force terminate the server by hitting Ctrl+C twice
// this is for better developer experience, we can remove when the server is stable enough
fprintf(stderr, "SIGINT is received second time, exit immediately...\n");
ngxson marked this conversation as resolved.
Show resolved Hide resolved
exit(1);
}
shutdown_handler(signal);
}

int main(int argc, char **argv)
{
Expand Down
Loading