Skip to content

server: move server-context to its own cpp|h #17595

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

Merged
merged 8 commits into from
Nov 29, 2025
+3,833 −3,664
Merged

server: move server-context to its own cpp|h #17595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3375c20
git mv
ngxson Nov 29, 2025
0150602
add server-context.h
ngxson Nov 29, 2025
9a7b4f3
add server-context.h
ngxson Nov 29, 2025
239c7a2
clean up headers
ngxson Nov 29, 2025
26204ae
cont : cleanup
ggerganov Nov 29, 2025
8b510b4
also expose server_response_reader (to be used by CLI)
ngxson Nov 29, 2025
2141a3e
fix windows build
ngxson Nov 29, 2025
c5f8cdf
decouple server_routes and server_http
ngxson Nov 29, 2025
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
Prev Previous commit
Next Next commit
cont : cleanup
  • Loading branch information
@ggerganov
ggerganov committed Nov 29, 2025
commit 26204aede77246605882c47b29375c225c9ad43f
6 changes: 0 additions & 6 deletions tools/server/server-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2509,12 +2509,6 @@ struct server_context_impl {
}
};

void server_context_impl_deleter::operator()(server_context_impl * ptr) const {
if (ptr) {
delete ptr;
}
}

//
// server_context (public API)
//
Expand Down
20 changes: 7 additions & 13 deletions tools/server/server-context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
#include "server-common.h"
#include "server-http.h"
#include "server-task.h"

#include "common.h"
#include "llama.h"
#include <nlohmann/json_fwd.hpp>

#include <cstddef>
#include <cinttypes>
#include <memory>

struct server_context_impl; // private implementation
struct server_context_impl_deleter {
void operator()(server_context_impl * p) const;
};

struct server_context {
std::unique_ptr<server_context_impl, server_context_impl_deleter> impl;
std::unique_ptr<server_context_impl> impl;

server_context();
~server_context();
Expand All @@ -42,15 +36,11 @@ struct server_context {
struct server_res_generator;

struct server_routes {
const common_params & params;
server_context_impl & ctx_server;
server_http_context & ctx_http; // for reading is_ready
server_routes(const common_params & params, server_context & ctx_server, server_http_context & ctx_http)
: params(params), ctx_server(*ctx_server.impl.get()), ctx_http(ctx_http) {
: params(params), ctx_server(*ctx_server.impl), ctx_http(ctx_http) {
init_routes();
}

public:
void init_routes();
// handlers using lambda function, so that they can capture `this` without `std::bind`
server_http_context::handler_t get_health;
Expand Down Expand Up @@ -81,4 +71,8 @@ struct server_routes {
std::unique_ptr<server_res_generator> handle_slots_restore(const server_http_req & req, int id_slot);
std::unique_ptr<server_res_generator> handle_slots_erase(const server_http_req &, int id_slot);
std::unique_ptr<server_res_generator> handle_embeddings_impl(const server_http_req & req, task_response_type res_type);

const common_params & params;
server_context_impl & ctx_server;
server_http_context & ctx_http; // for reading is_ready
};
Loading