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

Emfile (#1626)

Browse Source 
* Close the connection when EMFILE, See #1625

* close reserve_fd
This commit is contained in:
云风
2022-08-17 13:12:51 +08:00
committed by GitHub
parent 0c1491ba99
commit 8efad53631
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
skynet-src/socket_server.c
View File

@@ -114,6 +114,7 @@ struct socket {
struct socket_server { struct socket_server {
volatile uint64_t time; volatile uint64_t time;
int reserve_fd; // for EMFILE
int recvctrl_fd; int recvctrl_fd;
int sendctrl_fd; int sendctrl_fd;
int checkctrl; int checkctrl;
@@ -405,6 +406,7 @@ socket_server_create(uint64_t time) {
ss->recvctrl_fd = fd[0]; ss->recvctrl_fd = fd[0];
ss->sendctrl_fd = fd[1]; ss->sendctrl_fd = fd[1];
ss->checkctrl = 1; ss->checkctrl = 1;
ss->reserve_fd = dup(1); // reserve an extra fd for EMFILE
for (i=0;i<MAX_SOCKET;i++) { for (i=0;i<MAX_SOCKET;i++) {
struct socket *s = &ss->slot[i]; struct socket *s = &ss->slot[i];
@@ -525,6 +527,8 @@ socket_server_release(struct socket_server *ss) {
close(ss->sendctrl_fd); close(ss->sendctrl_fd);
close(ss->recvctrl_fd); close(ss->recvctrl_fd);
sp_release(ss->event_fd); sp_release(ss->event_fd);
if (ss->reserve_fd >= 0)
close(ss->reserve_fd);
FREE(ss); FREE(ss);
} }
@@ -1581,6 +1585,16 @@ report_accept(struct socket_server *ss, struct socket *s, struct socket_message
result->id = s->id; result->id = s->id;
result->ud = 0; result->ud = 0;
result->data = strerror(errno); result->data = strerror(errno);
// See https://stackoverflow.com/questions/47179793/how-to-gracefully-handle-accept-giving-emfile-and-close-the-connection
if (ss->reserve_fd >= 0) {
close(ss->reserve_fd);
client_fd = accept(s->fd, &u.s, &len);
if (client_fd >= 0) {
close(client_fd);
}
ss->reserve_fd = dup(1);
}
return -1; return -1;
} else { } else {
return 0; return 0;