tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-06-29 12:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break down main function in llama-server

Browse Source 
llama-server main function is getting meaty, just breaking it
down into smaller functions.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
This commit is contained in:
Eric Curtin
2025-05-10 13:07:25 +01:00
parent d8919424f1
commit 5c32fc3d13
1 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
tools/server/server.cpp
View File

@ -3546,7 +3546,7 @@ static void log_server_request(const httplib::Request & req, const httplib::Resp
std::function<void(int)> shutdown_handler; std::function<void(int)> shutdown_handler;
std::atomic_flag is_terminating = ATOMIC_FLAG_INIT; std::atomic_flag is_terminating = ATOMIC_FLAG_INIT;
inline void signal_handler(int signal) { static inline void signal_handler(int signal) {
if (is_terminating.test_and_set()) { if (is_terminating.test_and_set()) {
// in case it hangs, we can force terminate the server by hitting Ctrl+C twice // 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 // this is for better developer experience, we can remove when the server is stable enough
@ -3557,19 +3557,7 @@ inline void signal_handler(int signal) {
shutdown_handler(signal); shutdown_handler(signal);
} }
int main(int argc, char ** argv) { static bool initialize_server_context(common_params & params) {
// own arguments required by this example
common_params params;
if (!common_params_parse(argc, argv, params, LLAMA_EXAMPLE_SERVER)) {
return 1;
}
common_init();
// struct that contains llama context and inference
server_context ctx_server;
llama_backend_init(); llama_backend_init();
llama_numa_init(params.numa); llama_numa_init(params.numa);
@ -3578,24 +3566,50 @@ int main(int argc, char ** argv) {
LOG_INF("%s\n", common_params_get_system_info(params).c_str()); LOG_INF("%s\n", common_params_get_system_info(params).c_str());
LOG_INF("\n"); LOG_INF("\n");
std::unique_ptr<httplib::Server> svr; return true;
}
static std::unique_ptr<httplib::Server> setup_server(common_params & params) {
std::unique_ptr<httplib::Server> server;
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
if (params.ssl_file_key != "" && params.ssl_file_cert != "") { if (!params.ssl_file_key.empty() && !params.ssl_file_cert.empty()) {
LOG_INF("Running with SSL: key = %s, cert = %s\n", params.ssl_file_key.c_str(), params.ssl_file_cert.c_str()); LOG_INF("Running with SSL: key = %s, cert = %s", params.ssl_file_key.c_str(), params.ssl_file_cert.c_str());
svr.reset( server.reset(new httplib::SSLServer(params.ssl_file_cert.c_str(), params.ssl_file_key.c_str()));
new httplib::SSLServer(params.ssl_file_cert.c_str(), params.ssl_file_key.c_str())
);
} else { } else {
LOG_INF("Running without SSL\n"); LOG_INF("Running without SSL");
svr.reset(new httplib::Server()); server.reset(new httplib::Server());
} }
#else #else
if (params.ssl_file_key != "" && params.ssl_file_cert != "") { if (!params.ssl_file_key.empty() || !params.ssl_file_cert.empty()) {
LOG_ERR("Server is built without SSL support\n"); LOG_ERR("Server is built without SSL support");
return nullptr;
}
server.reset(new httplib::Server());
#endif
return server;
}
int main(int argc, char ** argv) {
// Parse and initialize common parameters
common_params params;
if (!common_params_parse(argc, argv, params, LLAMA_EXAMPLE_SERVER)) {
return 1;
}
common_init();
// Initialize server context
server_context ctx_server;
if (!initialize_server_context(params)) {
return 1;
}
// Setup server and configure properties
std::unique_ptr<httplib::Server> svr = setup_server(params);
if (!svr) {
return 1; return 1;
} }
svr.reset(new httplib::Server());
#endif
std::atomic<server_state> state{SERVER_STATE_LOADING_MODEL}; std::atomic<server_state> state{SERVER_STATE_LOADING_MODEL};