Skip to content

examples: fix coredump in llama-server after ctrl+c (#12180) #12813

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

Closed
wants to merge 1 commit into from
Closed

examples: fix coredump in llama-server after ctrl+c (#12180) #12813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4525,6 +4525,7 @@ int main(int argc, char ** argv) {

// run the HTTP server in a thread
std::thread t([&]() { svr->listen_after_bind(); });
t.detach();
svr->wait_until_ready();

LOG_INF("%s: HTTP server is listening, hostname: %s, port: %d, http threads: %d\n", __func__, params.hostname.c_str(), params.port, params.n_threads_http);
Expand All @@ -4534,9 +4535,8 @@ int main(int argc, char ** argv) {

if (!ctx_server.load_model(params)) {
clean_up();
// t.join(); // FIXME: see below
LOG_ERR("%s: exiting due to model loading error\n", __func__);
return 1;
exit(1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you explain why return 1 doesn't work here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because the thread is detached

}

ctx_server.init();
Expand Down Expand Up @@ -4582,7 +4582,6 @@ int main(int argc, char ** argv) {
ctx_server.queue_tasks.start_loop();

clean_up();
// t.join(); // FIXME: http thread may stuck if there is an on-going request. we don't need to care about this for now as the HTTP connection will already be closed at this point, but it's better to fix this

return 0;

exit(0);
}