Changeset a2317e

Timestamp:

02/25/10 00:46:13 (2 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

957de1

Parents:

0f1abf

git-author:

Tomash Brechko <tomash.brechko@…> (02/25/10 00:46:13)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/25/10 00:46:13)

Message:

Fix t/command.t on some Solaris systems where it fails.

The problem was that I used an old name MAX_IOVEC for the max number
of struct iovec passed to writev()/sendmsg(). When it wasn't defined
a value of 1024 was used. This was too much for some Solaris
distributions, which returned EINVAL in this case (other systems either
support this number natively, or compensate for it in libc).

Now we use either sysconf(_SC_IOV_MAX), or IOV_MAX, or safe minimum of
16 (64 on Win32).

Thanks to joyent.com for providing necessary Solaris traces.

Files:

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

Changes

@@ -6 +6 @@
 
         Changes since 0.17:
+
+        Fix t/command.t failure on some Solaris distributions.
 
         Make module thread-safe with Perl >= 5.7.2.

src/client.c

@@ -1 +1 @@
 /*
-  Copyright (C) 2007-2009 Tomash Brechko.  All rights reserved.
+  Copyright (C) 2007-2010 Tomash Brechko.  All rights reserved.
 
   When used to build Perl module:
@@ -42 +42 @@
 
 
-#ifndef MAX_IOVEC
-#define MAX_IOVEC  1024
-#endif
-
-
 /* REPLY_BUF_SIZE should be large enough to contain first reply line.  */
 #define REPLY_BUF_SIZE  1536
@@ -298 +293 @@
   struct array index_list;
   struct array str_buf;
+  int iov_max;
 
   generation_type generation;
@@ -400 +396 @@
   c->nowait = 0;
   c->hash_namespace = 0;
+
+  c->iov_max = get_iov_max();
 
   c->generation = 1;            /* Different from initial command state.  */
@@ -1193 +1191 @@
       size_t len;
 
-      count = (state->iov_count < MAX_IOVEC
-               ? state->iov_count : MAX_IOVEC);
+      count = (state->iov_count < state->client->iov_max
+               ? state->iov_count : state->client->iov_max);
 
       state->iov->iov_base =

src/socket_posix.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2008 Tomash Brechko.  All rights reserved.
+  Copyright (C) 2008, 2010 Tomash Brechko.  All rights reserved.
 
   When used to build Perl module:
@@ -29 +29 @@
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <limits.h>
 #include <errno.h>
+
+
+#if defined(_SC_IOV_MAX)
+
+#define get_iov_max()  sysconf(_SC_IOV_MAX)
+
+#elif defined(IOV_MAX)
+
+#define get_iov_max()  IOV_MAX
+
+#else
+
+#define get_iov_max()  16
+
+#endif
+
 
 #if defined(HAVE_POLL_H)

src/socket_win32.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2008-2009 Tomash Brechko.  All rights reserved.
+  Copyright (C) 2008-2010 Tomash Brechko.  All rights reserved.
 
   When used to build Perl module:
@@ -28 +28 @@
 #include <ws2tcpip.h>
 #include <sys/types.h>
+
+
+#define get_iov_max()  64