mirror of
https://github.com/cloudwu/skynet.git
synced 2026-07-25 04:33:05 +00:00
socket_server: 增加 request_package 初始化, 避免内存工具警告 (#2050)
* socket_server: 增加 request_package 初始化逻辑, 避免内存工具警告
* add request_init function instead of {0}
---------
Co-authored-by: efve.zff <efve.zff@alibaba-inc.com>
This commit is contained in:
@@ -163,7 +163,7 @@ struct request_listen {
|
|||||||
int id;
|
int id;
|
||||||
int fd;
|
int fd;
|
||||||
uintptr_t opaque;
|
uintptr_t opaque;
|
||||||
char host[1];
|
// char host[1];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct request_bind {
|
struct request_bind {
|
||||||
@@ -1855,9 +1855,15 @@ open_request(struct socket_server *ss, struct request_package *req, uintptr_t op
|
|||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
request_init(struct request_package *req) {
|
||||||
|
memset(req, 0, sizeof(*req));
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
socket_server_connect(struct socket_server *ss, uintptr_t opaque, const char * addr, int port) {
|
socket_server_connect(struct socket_server *ss, uintptr_t opaque, const char * addr, int port) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
int len = open_request(ss, &request, opaque, addr, port);
|
int len = open_request(ss, &request, opaque, addr, port);
|
||||||
if (len < 0)
|
if (len < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@@ -1921,6 +1927,7 @@ socket_server_send(struct socket_server *ss, struct socket_sendbuffer *buf) {
|
|||||||
socket_unlock(&l);
|
socket_unlock(&l);
|
||||||
|
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.send.id = id;
|
request.u.send.id = id;
|
||||||
request.u.send.sz = 0;
|
request.u.send.sz = 0;
|
||||||
request.u.send.buffer = NULL;
|
request.u.send.buffer = NULL;
|
||||||
@@ -1936,6 +1943,7 @@ socket_server_send(struct socket_server *ss, struct socket_sendbuffer *buf) {
|
|||||||
inc_sending_ref(s, id);
|
inc_sending_ref(s, id);
|
||||||
|
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.send.id = id;
|
request.u.send.id = id;
|
||||||
request.u.send.buffer = clone_buffer(buf, &request.u.send.sz);
|
request.u.send.buffer = clone_buffer(buf, &request.u.send.sz);
|
||||||
|
|
||||||
@@ -1957,6 +1965,7 @@ socket_server_send_lowpriority(struct socket_server *ss, struct socket_sendbuffe
|
|||||||
inc_sending_ref(s, id);
|
inc_sending_ref(s, id);
|
||||||
|
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.send.id = id;
|
request.u.send.id = id;
|
||||||
request.u.send.buffer = clone_buffer(buf, &request.u.send.sz);
|
request.u.send.buffer = clone_buffer(buf, &request.u.send.sz);
|
||||||
|
|
||||||
@@ -1967,12 +1976,14 @@ socket_server_send_lowpriority(struct socket_server *ss, struct socket_sendbuffe
|
|||||||
void
|
void
|
||||||
socket_server_exit(struct socket_server *ss) {
|
socket_server_exit(struct socket_server *ss) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
send_request(ss, &request, 'X', 0);
|
send_request(ss, &request, 'X', 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
socket_server_close(struct socket_server *ss, uintptr_t opaque, int id) {
|
socket_server_close(struct socket_server *ss, uintptr_t opaque, int id) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.close.id = id;
|
request.u.close.id = id;
|
||||||
request.u.close.shutdown = 0;
|
request.u.close.shutdown = 0;
|
||||||
request.u.close.opaque = opaque;
|
request.u.close.opaque = opaque;
|
||||||
@@ -1983,6 +1994,7 @@ socket_server_close(struct socket_server *ss, uintptr_t opaque, int id) {
|
|||||||
void
|
void
|
||||||
socket_server_shutdown(struct socket_server *ss, uintptr_t opaque, int id) {
|
socket_server_shutdown(struct socket_server *ss, uintptr_t opaque, int id) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.close.id = id;
|
request.u.close.id = id;
|
||||||
request.u.close.shutdown = 1;
|
request.u.close.shutdown = 1;
|
||||||
request.u.close.opaque = opaque;
|
request.u.close.opaque = opaque;
|
||||||
@@ -2059,6 +2071,7 @@ socket_server_listen(struct socket_server *ss, uintptr_t opaque, const char * ad
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
int id = reserve_id(ss);
|
int id = reserve_id(ss);
|
||||||
if (id < 0) {
|
if (id < 0) {
|
||||||
close(fd);
|
close(fd);
|
||||||
@@ -2074,6 +2087,7 @@ socket_server_listen(struct socket_server *ss, uintptr_t opaque, const char * ad
|
|||||||
int
|
int
|
||||||
socket_server_bind(struct socket_server *ss, uintptr_t opaque, int fd) {
|
socket_server_bind(struct socket_server *ss, uintptr_t opaque, int fd) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
int id = reserve_id(ss);
|
int id = reserve_id(ss);
|
||||||
if (id < 0)
|
if (id < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@@ -2087,6 +2101,7 @@ socket_server_bind(struct socket_server *ss, uintptr_t opaque, int fd) {
|
|||||||
void
|
void
|
||||||
socket_server_start(struct socket_server *ss, uintptr_t opaque, int id) {
|
socket_server_start(struct socket_server *ss, uintptr_t opaque, int id) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.resumepause.id = id;
|
request.u.resumepause.id = id;
|
||||||
request.u.resumepause.opaque = opaque;
|
request.u.resumepause.opaque = opaque;
|
||||||
send_request(ss, &request, 'R', sizeof(request.u.resumepause));
|
send_request(ss, &request, 'R', sizeof(request.u.resumepause));
|
||||||
@@ -2095,6 +2110,7 @@ socket_server_start(struct socket_server *ss, uintptr_t opaque, int id) {
|
|||||||
void
|
void
|
||||||
socket_server_pause(struct socket_server *ss, uintptr_t opaque, int id) {
|
socket_server_pause(struct socket_server *ss, uintptr_t opaque, int id) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.resumepause.id = id;
|
request.u.resumepause.id = id;
|
||||||
request.u.resumepause.opaque = opaque;
|
request.u.resumepause.opaque = opaque;
|
||||||
send_request(ss, &request, 'S', sizeof(request.u.resumepause));
|
send_request(ss, &request, 'S', sizeof(request.u.resumepause));
|
||||||
@@ -2103,6 +2119,7 @@ socket_server_pause(struct socket_server *ss, uintptr_t opaque, int id) {
|
|||||||
void
|
void
|
||||||
socket_server_nodelay(struct socket_server *ss, int id) {
|
socket_server_nodelay(struct socket_server *ss, int id) {
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.setopt.id = id;
|
request.u.setopt.id = id;
|
||||||
request.u.setopt.what = TCP_NODELAY;
|
request.u.setopt.what = TCP_NODELAY;
|
||||||
request.u.setopt.value = 1;
|
request.u.setopt.value = 1;
|
||||||
@@ -2141,6 +2158,7 @@ socket_server_udp(struct socket_server *ss, uintptr_t opaque, const char * addr,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.udp.id = id;
|
request.u.udp.id = id;
|
||||||
request.u.udp.fd = fd;
|
request.u.udp.fd = fd;
|
||||||
request.u.udp.opaque = opaque;
|
request.u.udp.opaque = opaque;
|
||||||
@@ -2172,6 +2190,7 @@ socket_server_udp_listen(struct socket_server *ss, uintptr_t opaque, const char*
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.udp.id = id;
|
request.u.udp.id = id;
|
||||||
request.u.udp.fd = fd;
|
request.u.udp.fd = fd;
|
||||||
request.u.udp.opaque = opaque;
|
request.u.udp.opaque = opaque;
|
||||||
@@ -2223,6 +2242,7 @@ socket_server_udp_dial(struct socket_server *ss, uintptr_t opaque, const char* a
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.dial_udp.id = id;
|
request.u.dial_udp.id = id;
|
||||||
request.u.dial_udp.fd = fd;
|
request.u.dial_udp.fd = fd;
|
||||||
request.u.dial_udp.opaque = opaque;
|
request.u.dial_udp.opaque = opaque;
|
||||||
@@ -2289,6 +2309,7 @@ socket_server_udp_send(struct socket_server *ss, const struct socket_udp_address
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.send_udp.send.id = id;
|
request.u.send_udp.send.id = id;
|
||||||
request.u.send_udp.send.buffer = clone_buffer(buf, &request.u.send_udp.send.sz);
|
request.u.send_udp.send.buffer = clone_buffer(buf, &request.u.send_udp.send.sz);
|
||||||
|
|
||||||
@@ -2329,6 +2350,7 @@ socket_server_udp_connect(struct socket_server *ss, int id, const char * addr, i
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
struct request_package request;
|
struct request_package request;
|
||||||
|
request_init(&request);
|
||||||
request.u.set_udp.id = id;
|
request.u.set_udp.id = id;
|
||||||
int protocol;
|
int protocol;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user