fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-10 03:06:05 +00:00
Code Issues Projects Releases Wiki Activity

writeToClient(): don't remove write handler if not needed.

Browse Source
This commit is contained in:
antirez 2015-09-28 19:33:09 +02:00
parent b741a90ce9
commit 063ecbd5e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/networking.c
View File

@ -818,7 +818,7 @@ void freeClientsInAsyncFreeQueue(void) {
/* Write data in output buffers to client. Return C_OK if the client /* Write data in output buffers to client. Return C_OK if the client
* is still valid after the call, C_ERR if it was freed. */ * is still valid after the call, C_ERR if it was freed. */
int writeToClient(int fd, client *c) { int writeToClient(int fd, client *c, int handler_installed) {
ssize_t nwritten = 0, totwritten = 0; ssize_t nwritten = 0, totwritten = 0;
size_t objlen; size_t objlen;
size_t objmem; size_t objmem;
@ -892,7 +892,7 @@ int writeToClient(int fd, client *c) {
} }
if (c->bufpos == 0 && listLength(c->reply) == 0) { if (c->bufpos == 0 && listLength(c->reply) == 0) {
c->sentlen = 0; c->sentlen = 0;
aeDeleteFileEvent(server.el,c->fd,AE_WRITABLE); if (handler_installed) aeDeleteFileEvent(server.el,c->fd,AE_WRITABLE);
/* Close connection after entire reply has been sent. */ /* Close connection after entire reply has been sent. */
if (c->flags & CLIENT_CLOSE_AFTER_REPLY) { if (c->flags & CLIENT_CLOSE_AFTER_REPLY) {
@ -907,7 +907,7 @@ int writeToClient(int fd, client *c) {
void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) { void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {
UNUSED(el); UNUSED(el);
UNUSED(mask); UNUSED(mask);
writeToClient(fd,privdata); writeToClient(fd,privdata,1);
} }
/* This function is called just before entering the event loop, in the hope /* This function is called just before entering the event loop, in the hope
@ -925,7 +925,7 @@ void handleClientsWithPendingWrites(void) {
listDelNode(server.clients_pending_write,ln); listDelNode(server.clients_pending_write,ln);
/* Try to write buffers to the client socket. */ /* Try to write buffers to the client socket. */
if (writeToClient(c->fd,c) == C_ERR) continue; if (writeToClient(c->fd,c,0) == C_ERR) continue;
/* If there is nothing left, do nothing. Otherwise install /* If there is nothing left, do nothing. Otherwise install
* the write handler. */ * the write handler. */