pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rdma callback get_buffer rename to get_recv_buffer

support_rdma
YuQing 2023-09-27 11:23:50 +08:00
parent a0fe474198
commit 60d6b49998
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sf_proto.c
View File

@ -72,7 +72,7 @@ int sf_check_response(ConnectionInfo *conn, SFResponseInfo *response,
if (conn->comm_type == fc_comm_type_rdma) { if (conn->comm_type == fc_comm_type_rdma) {
memcpy(response->error.message, G_RDMA_CONNECTION_CALLBACKS. memcpy(response->error.message, G_RDMA_CONNECTION_CALLBACKS.
get_buffer(conn)->buff + sizeof(SFCommonProtoHeader), get_recv_buffer(conn)->buff + sizeof(SFCommonProtoHeader),
response->error.length); response->error.length);
response->error.message[response->error.length] = '\0'; response->error.message[response->error.length] = '\0';
} else if ((result=tcprecvdata_nb_ex(conn->sock, response-> } else if ((result=tcprecvdata_nb_ex(conn->sock, response->
@ -106,7 +106,7 @@ static inline int sf_recv_response_header(ConnectionInfo *conn,
SFCommonProtoHeader header_proto; SFCommonProtoHeader header_proto;
if (conn->comm_type == fc_comm_type_rdma) { if (conn->comm_type == fc_comm_type_rdma) {
buffer = G_RDMA_CONNECTION_CALLBACKS.get_buffer(conn); buffer = G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn);
if (buffer->length < sizeof(SFCommonProtoHeader)) { if (buffer->length < sizeof(SFCommonProtoHeader)) {
response->error.length = sprintf(response->error.message, response->error.length = sprintf(response->error.message,
"recv pkg length: %d < header size: %d", "recv pkg length: %d < header size: %d",
@ -217,8 +217,8 @@ int sf_send_and_recv_response_ex(ConnectionInfo *conn, char *send_data,
} }
if (conn->comm_type == fc_comm_type_rdma) { if (conn->comm_type == fc_comm_type_rdma) {
memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_buffer(conn)->buff + memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
sizeof(SFCommonProtoHeader), response->header.body_len); buff + sizeof(SFCommonProtoHeader), response->header.body_len);
} else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response-> } else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
header.body_len, network_timeout, &recv_bytes)) != 0) header.body_len, network_timeout, &recv_bytes)) != 0)
{ {
@ -260,8 +260,8 @@ int sf_send_and_recv_response_ex1(ConnectionInfo *conn, char *send_data,
} }
if (conn->comm_type == fc_comm_type_rdma) { if (conn->comm_type == fc_comm_type_rdma) {
memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_buffer(conn)->buff + memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
sizeof(SFCommonProtoHeader), response->header.body_len); buff + sizeof(SFCommonProtoHeader), response->header.body_len);
*body_len = response->header.body_len; *body_len = response->header.body_len;
} else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response-> } else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
header.body_len, network_timeout, body_len)) != 0) header.body_len, network_timeout, body_len)) != 0)
@ -305,8 +305,8 @@ int sf_recv_response(ConnectionInfo *conn, SFResponseInfo *response,
} }
if (conn->comm_type == fc_comm_type_rdma) { if (conn->comm_type == fc_comm_type_rdma) {
memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_buffer(conn)->buff + memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
sizeof(SFCommonProtoHeader), response->header.body_len); buff + sizeof(SFCommonProtoHeader), response->header.body_len);
} else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, expect_body_len, } else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, expect_body_len,
network_timeout, &recv_bytes)) != 0) network_timeout, &recv_bytes)) != 0)
{ {
@ -376,7 +376,7 @@ int sf_recv_vary_response(ConnectionInfo *conn, SFResponseInfo *response,
} }
if (conn->comm_type == fc_comm_type_rdma) { if (conn->comm_type == fc_comm_type_rdma) {
memcpy(buffer->buff, G_RDMA_CONNECTION_CALLBACKS.get_buffer(conn)-> memcpy(buffer->buff, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
buff + sizeof(SFCommonProtoHeader), response->header.body_len); buff + sizeof(SFCommonProtoHeader), response->header.body_len);
} else if ((result=tcprecvdata_nb_ex(conn->sock, buffer->buff, response-> } else if ((result=tcprecvdata_nb_ex(conn->sock, buffer->buff, response->
header.body_len, network_timeout, &recv_bytes)) != 0) header.body_len, network_timeout, &recv_bytes)) != 0)