upstream/redis
1
0
Fork 0
mirror of https://github.com/redis/redis.git synced 2026-05-28 04:02:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge e0df683549 into 30f57f32bd

Browse source
This commit is contained in:
Vitah Lin 2026-05-28 12:29:09 +08:00 committed by GitHub
commit c9faa2ffb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
deps/hiredis/net.c vendored
View file

@ -62,8 +62,30 @@ void redisNetClose(redisContext *c) {
ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) {
ssize_t nread = recv(c->fd, buf, bufcap, 0);
if (nread == -1) {
if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
/* Try again later */
if (errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) {
/* If recv() reports EWOULDBLOCK on a non-blocking socket the
* event loop told us to read from, the socket may still have a
* pending asynchronous error (e.g. ICMP unreachable stored in
* SO_ERROR) that is causing epoll to raise EPOLLERR in a
* level-triggered fashion. Returning 0 here without consuming
* that error would make epoll_wait fire again immediately,
* busy-looping the event loop at ~100% CPU (see redis/redis#9956).
* Peek at SO_ERROR so the caller can tear the dead connection down. */
int so_error = 0;
socklen_t errlen = sizeof(so_error);
if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &so_error, &errlen) == -1) {
__redisSetError(c, REDIS_ERR_IO, strerror(errno));
return -1;
}
if (so_error != 0) {
errno = so_error;
__redisSetError(c, REDIS_ERR_IO, strerror(errno));
return -1;
}
/* No pending socket error — try again later. */
return 0;
} else if (errno == EINTR) {
/* Signal interrupted — retry. */
return 0;
} else if(errno == ETIMEDOUT && (c->flags & REDIS_BLOCK)) {
/* especially in windows */