Skip to content

Commit 6971b32

Browse files
committed
rpc : enable async operations
Start a dedicated backend thread in the rpc-server and use message passing interface for submitting work to it. This will enable backend async operations and cross-server communication.
1 parent a55eb1b commit 6971b32

File tree

1 file changed

+119
-32
lines changed

1 file changed

+119
-32
lines changed

ggml-rpc.cpp

Lines changed: 119 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
#include <cinttypes>
66
#include <string>
77
#include <vector>
8+
#include <queue>
89
#include <memory>
910
#include <mutex>
11+
#include <thread>
12+
#include <condition_variable>
1013
#include <unordered_map>
1114
#include <unordered_set>
1215
#ifdef _WIN32
@@ -736,6 +739,48 @@ GGML_API GGML_CALL void ggml_backend_rpc_get_device_memory(const char * endpoint
736739

737740
// RPC server-side implementation
738741

742+
template <typename T>
743+
class message_queue {
744+
std::queue<T> queue;
745+
std::mutex mutex;
746+
std::condition_variable cvar;
747+
748+
public:
749+
message_queue() {}
750+
751+
void push(const T &value) {
752+
std::unique_lock<std::mutex> lock(mutex);
753+
queue.push(value);
754+
lock.unlock();
755+
cvar.notify_all();
756+
}
757+
758+
void pop(T* out) {
759+
std::unique_lock<std::mutex> lock(mutex);
760+
cvar.wait(lock, [this] { return queue.size() > 0; });
761+
*out = queue.front();
762+
queue.pop();
763+
}
764+
};
765+
766+
struct rpc_response {
767+
std::vector<uint8_t> output;
768+
bool status;
769+
};
770+
771+
using rpc_response_ptr = std::shared_ptr<rpc_response>;
772+
using response_queue = message_queue<rpc_response_ptr>;
773+
using response_queue_ptr = std::shared_ptr<response_queue>;
774+
775+
struct rpc_request {
776+
rpc_cmd cmd;
777+
std::vector<uint8_t> input;
778+
response_queue_ptr response_queue;
779+
};
780+
using rpc_request_ptr = std::shared_ptr<rpc_request>;
781+
using request_queue = message_queue<rpc_request_ptr>;
782+
using request_queue_ptr = std::shared_ptr<request_queue>;
783+
739784
class rpc_server {
740785
public:
741786
rpc_server(ggml_backend_t backend) : backend(backend) {}
@@ -1052,70 +1097,107 @@ rpc_server::~rpc_server() {
10521097
}
10531098
}
10541099

1055-
static void rpc_serve_client(ggml_backend_t backend, sockfd_t sockfd, size_t free_mem, size_t total_mem) {
1100+
static void process_requests(ggml_backend_t backend, request_queue_ptr requestq) {
10561101
rpc_server server(backend);
10571102
while (true) {
1058-
uint8_t cmd;
1059-
if (!recv_data(sockfd, &cmd, 1)) {
1060-
break;
1061-
}
1062-
std::vector<uint8_t> input;
1063-
std::vector<uint8_t> output;
1064-
uint64_t input_size;
1065-
if (!recv_data(sockfd, &input_size, sizeof(input_size))) {
1066-
break;
1067-
}
1068-
input.resize(input_size);
1069-
if (!recv_data(sockfd, input.data(), input_size)) {
1070-
break;
1071-
}
1103+
rpc_request_ptr request;
1104+
requestq->pop(&request);
1105+
rpc_response_ptr response = std::make_shared<rpc_response>();
10721106
bool ok = true;
1073-
switch (cmd) {
1107+
switch (request->cmd) {
10741108
case ALLOC_BUFFER: {
1075-
ok = server.alloc_buffer(input, output);
1109+
ok = server.alloc_buffer(request->input, response->output);
10761110
break;
10771111
}
10781112
case GET_ALIGNMENT: {
1079-
server.get_alignment(output);
1113+
server.get_alignment(response->output);
10801114
break;
10811115
}
10821116
case GET_MAX_SIZE: {
1083-
server.get_max_size(output);
1117+
server.get_max_size(response->output);
10841118
break;
10851119
}
10861120
case BUFFER_GET_BASE: {
1087-
ok = server.buffer_get_base(input, output);
1121+
ok = server.buffer_get_base(request->input, response->output);
10881122
break;
10891123
}
10901124
case FREE_BUFFER: {
1091-
ok = server.free_buffer(input);
1125+
ok = server.free_buffer(request->input);
10921126
break;
10931127
}
10941128
case BUFFER_CLEAR: {
1095-
ok = server.buffer_clear(input);
1129+
ok = server.buffer_clear(request->input);
10961130
break;
10971131
}
10981132
case SET_TENSOR: {
1099-
ok = server.set_tensor(input);
1133+
ok = server.set_tensor(request->input);
11001134
break;
11011135
}
11021136
case GET_TENSOR: {
1103-
ok = server.get_tensor(input, output);
1137+
ok = server.get_tensor(request->input, response->output);
11041138
break;
11051139
}
11061140
case COPY_TENSOR: {
1107-
ok = server.copy_tensor(input, output);
1141+
ok = server.copy_tensor(request->input, response->output);
11081142
break;
11091143
}
11101144
case GRAPH_COMPUTE: {
1111-
ok = server.graph_compute(input, output);
1145+
ok = server.graph_compute(request->input, response->output);
1146+
break;
1147+
}
1148+
case GET_DEVICE_MEMORY: {
1149+
break;
1150+
}
1151+
default: {
1152+
fprintf(stderr, "Unknown command: %d\n", request->cmd);
1153+
ok = false;
1154+
}
1155+
}
1156+
response->status = ok;
1157+
request->response_queue->push(response);
1158+
}
1159+
}
1160+
1161+
static void rpc_serve_client(request_queue_ptr requestq, sockfd_t sockfd, size_t free_mem, size_t total_mem) {
1162+
auto responseq = std::make_shared<response_queue>();
1163+
while (true) {
1164+
uint8_t cmd;
1165+
if (!recv_data(sockfd, &cmd, 1)) {
1166+
break;
1167+
}
1168+
auto request = std::make_shared<rpc_request>();
1169+
request->cmd = (rpc_cmd)cmd;
1170+
request->response_queue = responseq;
1171+
uint64_t input_size;
1172+
if (!recv_data(sockfd, &input_size, sizeof(input_size))) {
1173+
break;
1174+
}
1175+
request->input.resize(input_size);
1176+
if (!recv_data(sockfd, request->input.data(), input_size)) {
1177+
break;
1178+
}
1179+
bool ok = true;
1180+
auto response = std::make_shared<rpc_response>();
1181+
switch (cmd) {
1182+
case ALLOC_BUFFER:
1183+
case GET_ALIGNMENT:
1184+
case GET_MAX_SIZE:
1185+
case BUFFER_GET_BASE:
1186+
case FREE_BUFFER:
1187+
case BUFFER_CLEAR:
1188+
case SET_TENSOR:
1189+
case GET_TENSOR:
1190+
case COPY_TENSOR:
1191+
case GRAPH_COMPUTE: {
1192+
requestq->push(request);
1193+
responseq->pop(&response);
11121194
break;
11131195
}
11141196
case GET_DEVICE_MEMORY: {
11151197
// output serialization format: | free (8 bytes) | total (8 bytes) |
1116-
output.resize(2*sizeof(uint64_t), 0);
1117-
memcpy(output.data(), &free_mem, sizeof(free_mem));
1118-
memcpy(output.data() + sizeof(uint64_t), &total_mem, sizeof(total_mem));
1198+
response->output.resize(2*sizeof(uint64_t), 0);
1199+
memcpy(response->output.data(), &free_mem, sizeof(free_mem));
1200+
memcpy(response->output.data() + sizeof(uint64_t), &total_mem, sizeof(total_mem));
11191201
break;
11201202
}
11211203
default: {
@@ -1126,17 +1208,22 @@ static void rpc_serve_client(ggml_backend_t backend, sockfd_t sockfd, size_t fre
11261208
if (!ok) {
11271209
break;
11281210
}
1129-
uint64_t output_size = output.size();
1211+
uint64_t output_size = response->output.size();
11301212
if (!send_data(sockfd, &output_size, sizeof(output_size))) {
11311213
break;
11321214
}
1133-
if (!send_data(sockfd, output.data(), output_size)) {
1215+
if (!send_data(sockfd, response->output.data(), output_size)) {
11341216
break;
11351217
}
11361218
}
11371219
}
11381220

11391221
void start_rpc_server(ggml_backend_t backend, const char * endpoint, size_t free_mem, size_t total_mem) {
1222+
auto requestq = std::make_shared<request_queue>();
1223+
std::thread backend_thread = std::thread([=] {
1224+
process_requests(backend, requestq);
1225+
});
1226+
11401227
std::string host;
11411228
int port;
11421229
if (!parse_endpoint(endpoint, host, port)) {
@@ -1164,7 +1251,7 @@ void start_rpc_server(ggml_backend_t backend, const char * endpoint, size_t free
11641251
return;
11651252
}
11661253
printf("Accepted client connection, free_mem=%zu, total_mem=%zu\n", free_mem, total_mem);
1167-
rpc_serve_client(backend, client_socket->fd, free_mem, total_mem);
1254+
rpc_serve_client(requestq, client_socket->fd, free_mem, total_mem);
11681255
printf("Client connection closed\n");
11691256
}
11701257
#ifdef _WIN32

0 commit comments

Comments
 (0)