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

socket.onclose() (#1364)

Browse Source 
* Add socket.onclose() and close socket immediately when socket channel closed by peer

* Revert read_socket(), Add SOCKET_MORE, See #1358

* remove warning log , because it's not a rare case any more. See #1358
This commit is contained in:
云风
2021-03-19 18:52:09 +08:00
committed by GitHub
parent a39c9b8b10
commit 9228b05dfe
4 changed files with 54 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
skynet-src/socket_server.c
View File

@@ -1408,74 +1408,17 @@ ctrl_cmd(struct socket_server *ss, struct socket_message *result) {
return -1;
}
struct stream_buffer {
char * buf;
int sz;
};
static char *
reserve_buffer(struct stream_buffer *buffer, int sz) {
if (buffer->buf == NULL) {
buffer->buf = (char *)MALLOC(sz);
return buffer->buf;
} else {
char * newbuffer = (char *)MALLOC(sz + buffer->sz);
memcpy(newbuffer, buffer->buf, buffer->sz);
char * ret = newbuffer + buffer->sz;
FREE(buffer->buf);
buffer->buf = newbuffer;
return ret;
}
}
static int
read_socket(struct socket *s, struct stream_buffer *buffer) {
int sz = s->p.size;
buffer->buf = NULL;
buffer->sz = 0;
int rsz = sz;
for (;;) {
char *buf = reserve_buffer(buffer, rsz);
int n = (int)read(s->fd, buf, rsz);
if (n <= 0) {
if (buffer->sz == 0) {
// read nothing
FREE(buffer->buf);
return n;
} else {
// ignore the error or hang up, returns buffer
// If socket is hang up, SOCKET_CLOSE will be send later.
// (buffer->sz should be 0 next time)
break;
}
}
buffer->sz += n;
if (n < rsz) {
break;
}
// n == rsz, read again ( and read more )
rsz *= 2;
}
int r = buffer->sz;
if (r > sz) {
s->p.size = sz * 2;
} else if (sz > MIN_READ_BUFFER && r*2 < sz) {
s->p.size = sz / 2;
}
return r;
}
// return -1 (ignore) when error
static int
forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lock *l, struct socket_message * result) {
struct stream_buffer buf;
int n = read_socket(s, &buf);
int sz = s->p.size;
char * buffer = MALLOC(sz);
int n = (int)read(s->fd, buffer, sz);
if (n<0) {
FREE(buffer);
switch(errno) {
case EINTR:
break;
case AGAIN_WOULDBLOCK:
skynet_error(NULL, "socket-server: EAGAIN capture.");
break;
default:
// close when error
@@ -1486,6 +1429,7 @@ forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lo
return -1;
}
if (n==0) {
FREE(buffer);
if (s->closing) {
// Rare case : if s->closing is true, reading event is disable, and SOCKET_CLOSE is raised.
if (nomore_sending_data(s)) {
@@ -1509,7 +1453,7 @@ forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lo
if (halfclose_read(s)) {
// discard recv data (Rare case : if socket is HALFCLOSE_READ, reading event is disable.)
FREE(buf.buf);
FREE(buffer);
return -1;
}
@@ -1518,7 +1462,15 @@ forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lo
result->opaque = s->opaque;
result->id = s->id;
result->ud = n;
result->data = buf.buf;
result->data = buffer;
if (n == sz) {
s->p.size *= 2;
return SOCKET_MORE;
} else if (sz > MIN_READ_BUFFER && n*2 < sz) {
s->p.size /= 2;
}
return SOCKET_DATA;
}
@@ -1757,6 +1709,10 @@ socket_server_poll(struct socket_server *ss, struct socket_message * result, int
int type;
if (s->protocol == PROTOCOL_TCP) {
type = forward_message_tcp(ss, s, &l, result);
if (type == SOCKET_MORE) {
--ss->event_index;
return SOCKET_DATA;
}
} else {
type = forward_message_udp(ss, s, &l, result);
if (type == SOCKET_UDP) {