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

use trylock in send_buffer

Browse Source
This commit is contained in:
Cloud Wu
2017-06-21 11:50:06 +08:00
parent 171f8eef01
commit aa42534208
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
skynet-src/socket_server.c
View File

@@ -682,7 +682,8 @@ send_buffer_(struct socket_server *ss, struct socket *s, struct socket_message *
static int static int
send_buffer(struct socket_server *ss, struct socket *s, struct socket_message *result) { send_buffer(struct socket_server *ss, struct socket *s, struct socket_message *result) {
spinlock_lock(&s->dw_lock); if (!spinlock_trylock(&s->dw_lock))
return -1; // blocked by direct write, send later.
if (s->dw_buffer) { if (s->dw_buffer) {
// add direct write buffer before high.head // add direct write buffer before high.head
struct write_buffer * buf = MALLOC(SIZEOF_TCPBUFFER); struct write_buffer * buf = MALLOC(SIZEOF_TCPBUFFER);
@@ -1445,8 +1446,9 @@ socket_server_send(struct socket_server *ss, int id, const void * buffer, int sz
s->dw_buffer = buffer; s->dw_buffer = buffer;
s->dw_size = sz; s->dw_size = sz;
s->dw_offset = n; s->dw_offset = n;
sp_write(ss->event_fd, s->fd, s, true);
spinlock_unlock(&s->dw_lock); spinlock_unlock(&s->dw_lock);
sp_write(ss->event_fd, s->fd, s, true);
return 0; return 0;
} }
spinlock_unlock(&s->dw_lock); spinlock_unlock(&s->dw_lock);