mempool/ckpool
mempool/ckpool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Keep rereading in parse_client_msg if the socket indicates it is still ready for further reads

Browse Source
This commit is contained in:
Con Kolivas 2014-10-03 14:10:26 +10:00
parent 8d625b736b
commit 86f72ff889
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/connector.c
View File

@ -185,19 +185,33 @@ static void send_client(conn_instance_t *ci, int64_t id, char *buf);
static void parse_client_msg(conn_instance_t *ci, client_instance_t *client)
{
int buflen, ret, selfail = 0;
ckpool_t *ckp = ci->pi->ckp;
char msg[PAGESIZE], *eol;
int buflen, ret;
json_t *val;
retry:
/* Select should always return positive after poll unless we have
* been disconnected. On retries, decide whether we should do further
* reads based on select readiness and only fail if we get an error. */
ret = wait_read_select(client->fd, 0);
if (ret < 1) {
if (ret > selfail)
return;
LOGINFO("Client fd %d disconnected - select fail with bufofs %d ret %d errno %d %s",
client->fd, client->bufofs, ret, errno, ret && errno ? strerror(errno) : "");
invalidate_client(ckp, ci, client);
return;
}
selfail = -1;
buflen = PAGESIZE - client->bufofs;
ret = recv(client->fd, client->buf + client->bufofs, buflen, 0);
if (ret < 1) {
/* We should have something to read if called since poll set
* this fd's revents status so if there's nothing it means the
* client has disconnected. */
LOGINFO("Client fd %d disconnected with bufofs %d ret %d errno %d %s",
client->fd, client->bufofs, ret, errno, errno ? strerror(errno) : "");
LOGINFO("Client fd %d disconnected - recv fail with bufofs %d ret %d errno %d %s",
client->fd, client->bufofs, ret, errno, ret && errno ? strerror(errno) : "");
invalidate_client(ckp, ci, client);
return;
}
@ -210,7 +224,7 @@ reparse:
invalidate_client(ckp, ci, client);
return;
}
return;
goto retry;
}
/* Do something useful with this message now */
@ -255,6 +269,7 @@ reparse:
if (client->bufofs)
goto reparse;
goto retry;
}
/* Waits on fds ready to read on from the list stored in conn_instance and