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

Translate rio fdset target EWOULDBLOCK error into ETIMEDOUT.

Browse Source 
EWOULDBLOCK with the fdset rio target is returned when we try to write
but the send timeout socket option triggered an error. Better to
translate the error in something the user can actually recognize as a
timeout.
This commit is contained in:
antirez 2014-10-22 15:58:13 +02:00
parent 7cffd74b38
commit 7728ee809d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rio.c
View File

@ -203,7 +203,14 @@ static size_t rioFdsetWrite(rio *r, const void *buf, size_t len) {
size_t nwritten = 0; size_t nwritten = 0;
while(nwritten != count) { while(nwritten != count) {
retval = write(r->io.fdset.fds[j],p+nwritten,count-nwritten); retval = write(r->io.fdset.fds[j],p+nwritten,count-nwritten);
if (retval <= 0) break; if (retval <= 0) {
/* With blocking sockets, which is the sole user of this
* rio target, EWOULDBLOCK is returned only because of
* the SO_SNDTIMEO socket option, so we translate the error
* into one more recognizable by the user. */
if (retval == -1 && errno == EWOULDBLOCK) errno = ETIMEDOUT;
break;
}
nwritten += retval; nwritten += retval;
} }