lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 04:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shutdown SHUT_RD after read 0, See #1346 for detail

Browse Source
This commit is contained in:
Cloud Wu
2021-02-25 22:30:57 +08:00
parent ccac1d4526
commit 29a212db8e
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
skynet-src/socket_server.c
View File

@@ -1094,6 +1094,23 @@ nomore_sending_data(struct socket *s) {
|| (ATOM_LOAD(&s->type) == SOCKET_TYPE_HALFCLOSE_WRITE); || (ATOM_LOAD(&s->type) == SOCKET_TYPE_HALFCLOSE_WRITE);
} }
static void
close_read(struct socket_server *ss, struct socket * s, struct socket_message *result) {
// Don't read socket later
ATOM_STORE(&s->type , SOCKET_TYPE_HALFCLOSE_READ);
enable_read(ss,s,false);
shutdown(s->fd, SHUT_RD);
result->id = s->id;
result->ud = 0;
result->data = NULL;
result->opaque = s->opaque;
}
static inline int
halfclose_read(struct socket *s) {
return ATOM_LOAD(&s->type) == SOCKET_TYPE_HALFCLOSE_READ;
}
static int static int
close_socket(struct socket_server *ss, struct request_close *request, struct socket_message *result) { close_socket(struct socket_server *ss, struct request_close *request, struct socket_message *result) {
int id = request->id; int id = request->id;
@@ -1108,15 +1125,8 @@ close_socket(struct socket_server *ss, struct request_close *request, struct soc
if (request->shutdown || nomore_sending_data(s)) { if (request->shutdown || nomore_sending_data(s)) {
force_close(ss,s,&l,result); force_close(ss,s,&l,result);
} else { } else {
// Don't read socket later
ATOM_STORE(&s->type , SOCKET_TYPE_HALFCLOSE_READ);
s->closing = true; s->closing = true;
enable_read(ss,s,false); close_read(ss, s, result);
shutdown(s->fd, SHUT_RD);
result->id = s->id;
result->ud = 0;
result->data = NULL;
result->opaque = s->opaque;
} }
return SOCKET_CLOSE; return SOCKET_CLOSE;
} }
@@ -1150,7 +1160,7 @@ resume_socket(struct socket_server *ss, struct request_resumepause *request, str
result->data = "invalid socket"; result->data = "invalid socket";
return SOCKET_ERR; return SOCKET_ERR;
} }
if (s->closing) if (halfclose_read(s))
return -1; return -1;
struct socket_lock l; struct socket_lock l;
socket_lock_init(s, &l); socket_lock_init(s, &l);
@@ -1448,22 +1458,20 @@ forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lo
return -1; return -1;
} }
if (n==0) { if (n==0) {
if (nomore_sending_data(s)) {
force_close(ss,s,l,result);
} else {
result->opaque = s->opaque;
result->id = s->id;
result->ud = 0;
result->data = NULL;
}
if (s->closing) { if (s->closing) {
// Already returned SOCKET_CLOSE if (nomore_sending_data(s)) {
return -1; force_close(ss,s,l,result);
return SOCKET_CLOSE;
} else {
// Already returned SOCKET_CLOSE
return -1;
}
} }
close_read(ss, s, result);
return SOCKET_CLOSE; return SOCKET_CLOSE;
} }
if (s->closing) { if (halfclose_read(s)) {
// discard recv data // discard recv data
FREE(buf.buf); FREE(buf.buf);
return -1; return -1;