mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-04-15 19:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

server : Support listening on a unix socket (#12613)

Browse Source 
* server : Bump cpp-httplib to include AF_UNIX windows support

Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>

* server : Allow running the server example on a unix socket

Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>

---------

Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>
This commit is contained in:
Piotr 2025-03-27 23:41:04 +01:00 committed by GitHub
parent 2969019837
commit 2099a9d5db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 331 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/arg.cpp
View File

@ -1979,7 +1979,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
).set_examples({LLAMA_EXAMPLE_EMBEDDING})); ).set_examples({LLAMA_EXAMPLE_EMBEDDING}));
add_opt(common_arg( add_opt(common_arg(
{"--host"}, "HOST", {"--host"}, "HOST",
string_format("ip address to listen (default: %s)", params.hostname.c_str()), string_format("ip address to listen, or bind to an UNIX socket if the address ends with .sock (default: %s)", params.hostname.c_str()),
[](common_params & params, const std::string & value) { [](common_params & params, const std::string & value) {
params.hostname = value; params.hostname = value;
} }

562
examples/server/httplib.h
View File

File diff suppressed because it is too large Load Diff

23
examples/server/server.cpp
View File

@ -4459,15 +4459,24 @@ int main(int argc, char ** argv) {
llama_backend_free(); llama_backend_free();
}; };
// bind HTTP listen port
bool was_bound = false; bool was_bound = false;
if (params.port == 0) { if (string_ends_with(std::string(params.hostname), ".sock")) {
int bound_port = svr->bind_to_any_port(params.hostname); LOG_INF("%s: setting address family to AF_UNIX\n", __func__);
if ((was_bound = (bound_port >= 0))) { svr->set_address_family(AF_UNIX);
params.port = bound_port; // bind_to_port requires a second arg, any value other than 0 should
} // simply get ignored
was_bound = svr->bind_to_port(params.hostname, 8080);
} else { } else {
was_bound = svr->bind_to_port(params.hostname, params.port); LOG_INF("%s: binding port with default address family\n", __func__);
// bind HTTP listen port
if (params.port == 0) {
int bound_port = svr->bind_to_any_port(params.hostname);
if ((was_bound = (bound_port >= 0))) {
params.port = bound_port;
}
} else {
was_bound = svr->bind_to_port(params.hostname, params.port);
}
} }
if (!was_bound) { if (!was_bound) {