Changeset b495a1

Timestamp:

10/07/08 10:08:08 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

65a14e

Parents:

f0c0ca

git-author:

Tomash Brechko <tomash.brechko@…> (10/07/08 10:08:08)

git-committer:

Tomash Brechko <tomash.brechko@…> (10/07/08 10:08:08)

Message:

Move can_poll_fd() to header, and make it no-op on Win32.

See added comment describing FD_SETSIZE on Win32.

Files:

• Changes (modified) (1 diff)
• README (modified) (1 diff)
• src/poll_select.c (modified) (1 diff)
• src/poll_select.h (modified) (1 diff)
• src/socket_posix.h (modified) (1 diff)
• src/socket_win32.h (modified) (2 diffs)

Changes

@@ -10 +10 @@
         Add support for Win32.  I personally don't have the system nor
         compiler, so I can't even test the build.  Win32 port is
-        expected to be supported by community.
+        expected to be supported by community.  Note: on Win32 below
+        Windows Vista max number of memcached servers is 64.  See
+        comment on FD_SETSIZE in src/socket_win32.h to learn how to
+        increase this value if you need to connect to more than 64
+        servers.
 
         Use poll() system call instead of select().  The latter has

README

@@ -21 +21 @@
 The module should compile and work on any Unix-derived system.  Win32
 support is based on the patch by Yasuhiro Matsumoto---thanks!, and is
-(expected to be) supported by community.
+(expected to be) supported by community.  Note: on Win32 below Windows
+Vista max number of memcached servers is 64.  See comment on
+FD_SETSIZE in src/socket_win32.h to learn how to increase this value
+if you need to connect to more than 64 servers.
 
 Despite the low version number (which mainly reflects release history)

src/poll_select.c

@@ -28 +28 @@
 #include "socket_win32.h"
 #endif  /* WIN32 */
-
-
-int
-can_poll_fd(int fd)
-{
-  return (fd < FD_SETSIZE);
-}
 
 

src/poll_select.h

@@ -36 +36 @@
 
 
-extern
-int
-can_poll_fd(int fd);
-
-
 struct pollfd
 {

src/socket_posix.h

@@ -49 +49 @@
 #define poll(fds, nfds, timeout)  poll_select(fds, nfds, timeout)
 
+#define can_poll_fd(fd)  ((fd) < FD_SETSIZE)
+
 #endif  /* ! defined(HAVE_POLL_H) && ! defined(HAVE_SYS_POLL_H) */
 

src/socket_win32.h

@@ -36 +36 @@
 #define poll(fds, nfds, timeout)  WSAPoll(fds, nfds, timeout)
 
-#define can_poll_fd(fd)  1
-
 #else  /* ! (_WIN32_WINNT >= 0x0600) */
 
@@ -45 +43 @@
 
 #endif  /* ! (_WIN32_WINNT >= 0x0600) */
+
+
+/*
+  On Win32 FD_SETSIZE is not the limit on the max fd value, but
+  instead the limit on the total number of fds that select() can
+  handle.  So can_poll_fd() should return 1 in any case, any fd is
+  select()'able or WSAPoll()'able.  By default FD_SETSIZE is 64.  If
+  you plan to use more memcached servers, you may redefine it to a
+  larger value before including <winsock2.h>.
+*/
+#define can_poll_fd(fd)  1