Changeset 687f7d

Timestamp:

04/24/10 14:12:00 (22 months ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master

Children:

335378

Parents:

ed2993

git-author:

Tomash Brechko <tomash.brechko@…> (04/24/10 14:12:00)

git-committer:

Tomash Brechko <tomash.brechko@…> (04/24/10 14:12:00)

Message:

Revert "Fix SIGPIPE ignoring."

Turned out some orthodox systems do not have sigtimedwait(). Since
advanced systems that have sigtimedwait() also have MSG_NOSIGNAL and
thus do not use SIGPIPE suppression code in question, and other
systems have neither MSG_NOSIGNAL nor sigtimedwait(), the only option
is to revert to the previous suppression code. It works correctly
unless your program is multi-threaded.

This reverts commit 957de1c85a26ef090d3ac1dfa0d244fd1032556d.

Files:

• TODO (modified) (1 diff)
• src/client.c (modified) (4 diffs)

TODO

@@ -32 +32 @@
   (SOL_SOCKET option).
 
+- use sigpending() for SIGPIPE.
+
 - set close-on-exec (SO_CLOEXEC).
 

src/client.c

@@ -283 +283 @@
   size_t prefix_len;
 
-  sigset_t sigpipe_mask;
-
   int connect_timeout;          /* 1/1000 sec.  */
   int io_timeout;               /* 1/1000 sec.  */
@@ -388 +386 @@
 
   dispatch_init(&c->dispatch);
-
-  sigemptyset(&c->sigpipe_mask);
-  sigaddset(&c->sigpipe_mask, SIGPIPE);
 
   c->connect_timeout = 250;
@@ -1442 +1437 @@
 
 #if ! defined(MSG_NOSIGNAL) && ! defined(WIN32)
-  int sigpipe_pending, sigpipe_unblock = 0;
-  sigset_t pending;
-
-  sigpending(&pending);
-  sigpipe_pending = sigismember(&pending, SIGPIPE);
-  if (! sigpipe_pending)
-    {
-      sigset_t blocked;
-
-      pthread_sigmask(SIG_BLOCK, &c->sigpipe_mask, &blocked);
-      sigpipe_unblock = ! sigismember(&blocked, SIGPIPE);
-    }
+  struct sigaction orig, ignore;
+  int res;
+
+  ignore.sa_handler = SIG_IGN;
+  sigemptyset(&ignore.sa_mask);
+  ignore.sa_flags = 0;
+  res = sigaction(SIGPIPE, &ignore, &orig);
+  if (res == -1)
+    return MEMCACHED_FAILURE;
 #endif /* ! defined(MSG_NOSIGNAL) && ! defined(WIN32) */
 
@@ -1559 +1551 @@
 
 #if ! defined(MSG_NOSIGNAL) && ! defined(WIN32)
-  if (! sigpipe_pending)
-    {
-      sigpending(&pending);
-      if (sigismember(&pending, SIGPIPE))
-        {
-          static const struct timespec nowait = { 0, 0 };
-          int res;
-
-          do
-            res = sigtimedwait(&c->sigpipe_mask, NULL, &nowait);
-          while (res == -1 && errno == EINTR);
-        }
-
-      if (sigpipe_unblock)
-        pthread_sigmask(SIG_UNBLOCK, &c->sigpipe_mask, NULL);
-    }
+  /*
+    Ignore return value of sigaction(), there's nothing we can do in
+    the case of error.
+  */
+  sigaction(SIGPIPE, &orig, NULL);
 #endif /* ! defined(MSG_NOSIGNAL) && ! defined(WIN32) */