mirror of
https://github.com/vale981/ray
synced 2025-03-09 04:46:38 -04:00
fc76586518
* Switch hiredis on Windows to that of the Windows port of Redis * Use boost::asio::ip::tcp::socket::native_handle_type * Use normal hiredis instead of Windows-specific one * Finish up using normal hiredis Co-authored-by: Mehrdad <noreply@github.com>
67 lines
2 KiB
Diff
67 lines
2 KiB
Diff
diff --git deps/hiredis/hiredis.c deps/hiredis/hiredis.c
|
|
--- deps/hiredis/hiredis.c
|
|
+++ deps/hiredis/hiredis.c
|
|
@@ -620,1 +620,1 @@
|
|
- close(c->fd);
|
|
+ redisContextCloseFd(c);
|
|
@@ -648,1 +648,1 @@
|
|
- close(c->fd);
|
|
+ redisContextCloseFd(c);
|
|
diff --git deps/hiredis/net.h deps/hiredis/net.h
|
|
--- deps/hiredis/net.h
|
|
+++ deps/hiredis/net.h
|
|
@@ -44,1 +44,2 @@
|
|
+void redisContextCloseFd(redisContext *c);
|
|
int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
|
|
diff --git deps/hiredis/net.c deps/hiredis/net.c
|
|
--- deps/hiredis/net.c
|
|
+++ deps/hiredis/net.c
|
|
@@ -60,6 +60,10 @@
|
|
-static void redisContextCloseFd(redisContext *c) {
|
|
+void redisContextCloseFd(redisContext *c) {
|
|
if (c && c->fd >= 0) {
|
|
+#ifdef _WINSOCKAPI_
|
|
+ closesocket(_get_osfhandle(c->fd)) == 0 || (WSAGetLastError() == WSAENOTSOCK && _close(c->fd) == 0);
|
|
+#else
|
|
close(c->fd);
|
|
+#endif
|
|
c->fd = -1;
|
|
}
|
|
}
|
|
@@ -102,24 +106,33 @@
|
|
static int redisSetBlocking(redisContext *c, int blocking) {
|
|
int flags;
|
|
|
|
- /* Set the socket nonblocking.
|
|
+ /* Set the socket nonblocking. */
|
|
+#ifdef _WINSOCKAPI_
|
|
+ unsigned long value = !blocking;
|
|
+ if (ioctlsocket(c->fd, FIONBIO, &value) == SOCKET_ERROR) {
|
|
+ __redisSetErrorFromErrno(c,REDIS_ERR_IO,"ioctlsocket(FIONBIO)");
|
|
+ redisContextCloseFd(c);
|
|
+ return REDIS_ERR;
|
|
+ }
|
|
+#else
|
|
- * Note that fcntl(2) for F_GETFL and F_SETFL can't be
|
|
+ /* Note that fcntl(2) for F_GETFL and F_SETFL can't be
|
|
* interrupted by a signal. */
|
|
if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
|
|
__redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
|
|
redisContextCloseFd(c);
|
|
return REDIS_ERR;
|
|
}
|
|
|
|
if (blocking)
|
|
flags &= ~O_NONBLOCK;
|
|
else
|
|
flags |= O_NONBLOCK;
|
|
|
|
if (fcntl(c->fd, F_SETFL, flags) == -1) {
|
|
__redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
|
|
redisContextCloseFd(c);
|
|
return REDIS_ERR;
|
|
}
|
|
+#endif
|
|
return REDIS_OK;
|
|
}
|
|
--
|