Skip to content

Commit a43e1dc

Browse files
ngxsonngxson
committed
apply review comments
1 parent 2e560f9 commit a43e1dc

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎examples/server/server.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ struct server_task_result {
234234
};
235235

236236
// using shared_ptr for polymorphism of server_task_result
237-
using task_result_ptr = std::unique_ptr<server_task_result>;
237+
using server_task_result_ptr = std::unique_ptr<server_task_result>;
238238

239239
inline std::string stop_type_to_str(stop_type type) {
240240
switch (type) {
@@ -1097,7 +1097,7 @@ struct server_response {
10971097
std::unordered_set<int> waiting_task_ids;
10981098

10991099
// the main result queue (using ptr for polymorphism)
1100-
std::vector<task_result_ptr> queue_results;
1100+
std::vector<server_task_result_ptr> queue_results;
11011101

11021102
std::mutex mutex_results;
11031103
std::condition_variable condition_results;
@@ -1137,7 +1137,7 @@ struct server_response {
11371137
}
11381138

11391139
// This function blocks the thread until there is a response for one of the id_tasks
1140-
task_result_ptr recv(const std::unordered_set<int> & id_tasks) {
1140+
server_task_result_ptr recv(const std::unordered_set<int> & id_tasks) {
11411141
while (true) {
11421142
std::unique_lock<std::mutex> lock(mutex_results);
11431143
condition_results.wait(lock, [&]{
@@ -1146,7 +1146,7 @@ struct server_response {
11461146

11471147
for (int i = 0; i < (int) queue_results.size(); i++) {
11481148
if (id_tasks.find(queue_results[i]->id) != id_tasks.end()) {
1149-
task_result_ptr res = std::move(queue_results[i]);
1149+
server_task_result_ptr res = std::move(queue_results[i]);
11501150
queue_results.erase(queue_results.begin() + i);
11511151
return res;
11521152
}
@@ -1157,13 +1157,13 @@ struct server_response {
11571157
}
11581158

11591159
// single-task version of recv()
1160-
task_result_ptr recv(int id_task) {
1160+
server_task_result_ptr recv(int id_task) {
11611161
std::unordered_set<int> id_tasks = {id_task};
11621162
return recv(id_tasks);
11631163
}
11641164

11651165
// Send a new result to a waiting id_task
1166-
void send(task_result_ptr && result) {
1166+
void send(server_task_result_ptr && result) {
11671167
SRV_DBG("sending result for task id = %d\n", result->id);
11681168

11691169
std::unique_lock<std::mutex> lock(mutex_results);
@@ -2078,11 +2078,11 @@ struct server_context {
20782078
// receive the results from task(s) created by create_tasks_inference
20792079
void receive_multi_results(
20802080
const std::unordered_set<int> & id_tasks,
2081-
const std::function<void(std::vector<task_result_ptr>&)> & result_handler,
2081+
const std::function<void(std::vector<server_task_result_ptr>&)> & result_handler,
20822082
const std::function<void(json)> & error_handler) {
2083-
std::vector<task_result_ptr> results(id_tasks.size());
2083+
std::vector<server_task_result_ptr> results(id_tasks.size());
20842084
for (size_t i = 0; i < id_tasks.size(); i++) {
2085-
task_result_ptr result = queue_results.recv(id_tasks);
2085+
server_task_result_ptr result = queue_results.recv(id_tasks);
20862086

20872087
if (result->is_error()) {
20882088
error_handler(result->to_json());
@@ -2104,12 +2104,12 @@ struct server_context {
21042104

21052105
// receive the results from task(s) created by create_tasks_inference, in stream mode
21062106
void receive_cmpl_results_stream(
2107-
const std::unordered_set<int> & id_tasks, const
2108-
std::function<bool(task_result_ptr&)> & result_handler, const
2109-
std::function<void(json)> & error_handler) {
2107+
const std::unordered_set<int> & id_tasks,
2108+
const std::function<bool(server_task_result_ptr&)> & result_handler,
2109+
const std::function<void(json)> & error_handler) {
21102110
size_t n_finished = 0;
21112111
while (true) {
2112-
task_result_ptr result = queue_results.recv(id_tasks);
2112+
server_task_result_ptr result = queue_results.recv(id_tasks);
21132113

21142114
if (result->is_error()) {
21152115
error_handler(result->to_json());
@@ -3108,7 +3108,7 @@ int main(int argc, char ** argv) {
31083108
ctx_server.queue_tasks.post(task, true); // high-priority task
31093109

31103110
// get the result
3111-
task_result_ptr result = ctx_server.queue_results.recv(task.id);
3111+
server_task_result_ptr result = ctx_server.queue_results.recv(task.id);
31123112
ctx_server.queue_results.remove_waiting_task_id(task.id);
31133113

31143114
if (result->is_error()) {
@@ -3148,7 +3148,7 @@ int main(int argc, char ** argv) {
31483148
ctx_server.queue_tasks.post(task, true); // high-priority task
31493149

31503150
// get the result
3151-
task_result_ptr result = ctx_server.queue_results.recv(task.id);
3151+
server_task_result_ptr result = ctx_server.queue_results.recv(task.id);
31523152
ctx_server.queue_results.remove_waiting_task_id(task.id);
31533153

31543154
if (result->is_error()) {
@@ -3257,7 +3257,7 @@ int main(int argc, char ** argv) {
32573257
const int id_task = ctx_server.queue_tasks.post(task);
32583258
ctx_server.queue_results.add_waiting_task_id(id_task);
32593259

3260-
task_result_ptr result = ctx_server.queue_results.recv(id_task);
3260+
server_task_result_ptr result = ctx_server.queue_results.recv(id_task);
32613261
ctx_server.queue_results.remove_waiting_task_id(id_task);
32623262

32633263
if (result->is_error()) {
@@ -3288,7 +3288,7 @@ int main(int argc, char ** argv) {
32883288
const int id_task = ctx_server.queue_tasks.post(task);
32893289
ctx_server.queue_results.add_waiting_task_id(id_task);
32903290

3291-
task_result_ptr result = ctx_server.queue_results.recv(id_task);
3291+
server_task_result_ptr result = ctx_server.queue_results.recv(id_task);
32923292
ctx_server.queue_results.remove_waiting_task_id(id_task);
32933293

32943294
if (result->is_error()) {
@@ -3310,7 +3310,7 @@ int main(int argc, char ** argv) {
33103310
const int id_task = ctx_server.queue_tasks.post(task);
33113311
ctx_server.queue_results.add_waiting_task_id(id_task);
33123312

3313-
task_result_ptr result = ctx_server.queue_results.recv(id_task);
3313+
server_task_result_ptr result = ctx_server.queue_results.recv(id_task);
33143314
ctx_server.queue_results.remove_waiting_task_id(id_task);
33153315

33163316
if (result->is_error()) {
@@ -3395,7 +3395,7 @@ int main(int argc, char ** argv) {
33953395
const auto task_ids = server_task::get_list_id(tasks);
33963396

33973397
if (!stream) {
3398-
ctx_server.receive_multi_results(task_ids, [&](std::vector<task_result_ptr> & results) {
3398+
ctx_server.receive_multi_results(task_ids, [&](std::vector<server_task_result_ptr> & results) {
33993399
if (results.size() == 1) {
34003400
// single result
34013401
res_ok(res, oai_compat ? results[0]->to_json_oai_compat() : results[0]->to_json());
@@ -3414,7 +3414,7 @@ int main(int argc, char ** argv) {
34143414
ctx_server.queue_results.remove_waiting_task_ids(task_ids);
34153415
} else {
34163416
const auto chunked_content_provider = [task_ids, &ctx_server, oai_compat](size_t, httplib::DataSink & sink) {
3417-
ctx_server.receive_cmpl_results_stream(task_ids, [&](task_result_ptr & result) -> bool {
3417+
ctx_server.receive_cmpl_results_stream(task_ids, [&](server_task_result_ptr & result) -> bool {
34183418
json res_json = oai_compat ? result->to_json_oai_compat() : result->to_json();
34193419
if (res_json.is_array()) {
34203420
for (const auto & res : res_json) {
@@ -3609,7 +3609,7 @@ int main(int argc, char ** argv) {
36093609
// get the result
36103610
std::unordered_set<int> task_ids = server_task::get_list_id(tasks);
36113611

3612-
ctx_server.receive_multi_results(task_ids, [&](std::vector<task_result_ptr> & results) {
3612+
ctx_server.receive_multi_results(task_ids, [&](std::vector<server_task_result_ptr> & results) {
36133613
for (auto & res : results) {
36143614
GGML_ASSERT(dynamic_cast<server_task_result_embd*>(res.get()) != nullptr);
36153615
responses.push_back(res->to_json());
@@ -3688,7 +3688,7 @@ int main(int argc, char ** argv) {
36883688
// get the result
36893689
std::unordered_set<int> task_ids = server_task::get_list_id(tasks);
36903690

3691-
ctx_server.receive_multi_results(task_ids, [&](std::vector<task_result_ptr> & results) {
3691+
ctx_server.receive_multi_results(task_ids, [&](std::vector<server_task_result_ptr> & results) {
36923692
for (auto & res : results) {
36933693
GGML_ASSERT(dynamic_cast<server_task_result_rerank*>(res.get()) != nullptr);
36943694
responses.push_back(res->to_json());
@@ -3747,7 +3747,7 @@ int main(int argc, char ** argv) {
37473747
const int id_task = ctx_server.queue_tasks.post(task);
37483748
ctx_server.queue_results.add_waiting_task_id(id_task);
37493749

3750-
task_result_ptr result = ctx_server.queue_results.recv(id_task);
3750+
server_task_result_ptr result = ctx_server.queue_results.recv(id_task);
37513751
ctx_server.queue_results.remove_waiting_task_id(id_task);
37523752

37533753
if (result->is_error()) {

0 commit comments

Comments
 (0)