Commit e799a53a2c4f01be404363c98b9d28fcc6209386
2014-02-01T23:01:38
Handle interruptions to various select calls in util.c
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/util.c b/util.c
index 053dae4..f664cf0 100644
--- a/util.c
+++ b/util.c
@@ -1259,11 +1259,14 @@ static enum send_ret __stratum_send(struct pool *pool, char *s, ssize_t len)
struct timeval timeout = {1, 0};
ssize_t sent;
fd_set wd;
-
+retry:
FD_ZERO(&wd);
FD_SET(sock, &wd);
- if (select(sock + 1, NULL, &wd, NULL, &timeout) < 1)
+ if (select(sock + 1, NULL, &wd, NULL, &timeout) < 1) {
+ if (interrupted())
+ goto retry;
return SEND_SELECTFAIL;
+ }
#ifdef __APPLE__
sent = send(pool->sock, s + ssent, len, SO_NOSIGPIPE);
#elif WIN32
@@ -2177,6 +2180,7 @@ static bool setup_stratum_socket(struct pool *pool)
applog(LOG_DEBUG, "Failed sock connect");
continue;
}
+retry:
FD_ZERO(&rw);
FD_SET(sockd, &rw);
selret = select(sockd + 1, NULL, &rw, NULL, &tv_timeout);
@@ -2192,6 +2196,8 @@ static bool setup_stratum_socket(struct pool *pool)
break;
}
}
+ if (selret < 0 && interrupted())
+ goto retry;
CLOSESOCKET(sockd);
applog(LOG_DEBUG, "Select timeout/failed connect");
continue;
@@ -2605,6 +2611,7 @@ int _cgsem_mswait(cgsem_t *cgsem, int ms, const char *file, const char *func, co
fd_set rd;
char buf;
+retry:
fd = cgsem->pipefd[0];
FD_ZERO(&rd);
FD_SET(fd, &rd);
@@ -2617,6 +2624,8 @@ int _cgsem_mswait(cgsem_t *cgsem, int ms, const char *file, const char *func, co
}
if (likely(!ret))
return ETIMEDOUT;
+ if (interrupted())
+ goto retry;
quitfrom(1, file, func, line, "Failed to sem_timedwait errno=%d cgsem=0x%p", errno, cgsem);
/* We don't reach here */
return 0;
diff --git a/util.h b/util.h
index 90b1ca9..c4d21ca 100644
--- a/util.h
+++ b/util.h
@@ -24,6 +24,10 @@
{
return (errno == ETIMEDOUT);
}
+ static inline bool interrupted(void)
+ {
+ return (errno == EINTR);
+ }
#elif defined WIN32
#include <ws2tcpip.h>
#include <winsock2.h>
@@ -43,7 +47,11 @@
}
static inline bool sock_timeout(void)
{
- return (errno == WSAETIMEDOUT);
+ return (WSAGetLastError() == WSAETIMEDOUT);
+ }
+ static inline bool interrupted(void)
+ {
+ return (WSAGetLastError() == WSAEINTR);
}
#ifndef SHUT_RDWR
#define SHUT_RDWR SD_BOTH