X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fsignal.cc;h=42e6d78da39234032bb3736aa6df3ccfe22c5ad0;hb=357b107e59d9918a0f3bdd7e4aad9493c70e03f1;hp=263d183a2b4d7022f333529d6dbbbdbb0b6cba00;hpb=582b47ae25f9fecc459204592f23491297488cd8;p=m6w6%2Flibmemcached

diff --git a/libtest/signal.cc b/libtest/signal.cc
index 263d183a..42e6d78d 100644
--- a/libtest/signal.cc
+++ b/libtest/signal.cc
@@ -1,39 +1,25 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  uTest, libtest
+ *  libtest
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
  *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+
 #include <libtest/common.h>
 
 #include <csignal>
@@ -99,12 +85,25 @@ void SignalThread::test()
 
 SignalThread::~SignalThread()
 {
+  if (not is_shutdown())
+  {
+    set_shutdown(SHUTDOWN_GRACEFUL);
+  }
+
+#if 0
   if (pthread_equal(thread, pthread_self()) != 0 and (pthread_kill(thread, 0) == ESRCH) == true)
   {
     void *retval;
     pthread_join(thread, &retval);
   }
+#endif
   sem_destroy(&lock);
+
+  int error;
+  if ((error= pthread_sigmask(SIG_UNBLOCK, &set, NULL)) != 0)
+  {
+    Error << "While trying to reset signal mask to original set, pthread_sigmask() died during pthread_sigmask(" << strerror(error) << ")";
+  }
 }
 
 extern "C" {
@@ -137,6 +136,11 @@ static void *sig_thread(void *arg)
         context->set_shutdown(SHUTDOWN_FORCED);
       }
       break;
+    case SIGPIPE:
+      {
+        Error << "Ignoring SIGPIPE";
+      }
+      break;
 
     default:
       Error << "Signal handling thread got unexpected signal " <<  strsignal(sig);
@@ -161,10 +165,14 @@ SignalThread::SignalThread() :
     sigaddset(&set, SIGQUIT);
     sigaddset(&set, SIGINT);
   }
+  sigaddset(&set, SIGPIPE);
 
   sigaddset(&set, SIGUSR2);
 
   sem_init(&lock, 0, 0);
+
+  sigemptyset(&original_set);
+  pthread_sigmask(SIG_BLOCK, NULL, &original_set);
 }
 
 
@@ -172,19 +180,15 @@ bool SignalThread::setup()
 {
   set_shutdown(SHUTDOWN_RUNNING);
 
-  sigset_t old_set;
-  sigemptyset(&old_set);
-  pthread_sigmask(SIG_BLOCK, NULL, &old_set);
-
-  if (sigismember(&old_set, SIGQUIT))
+  if (sigismember(&original_set, SIGQUIT))
   {
     Error << strsignal(SIGQUIT) << " has been previously set.";
   }
-  if (sigismember(&old_set, SIGINT))
+  if (sigismember(&original_set, SIGINT))
   {
     Error << strsignal(SIGINT) << " has been previously set.";
   }
-  if (sigismember(&old_set, SIGUSR2))
+  if (sigismember(&original_set, SIGUSR2))
   {
     Error << strsignal(SIGUSR2) << " has been previously set.";
   }