projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update libtest/associated tests.
[awesomized/libmemcached]
/
libtest
/
signal.cc
diff --git
a/libtest/signal.cc
b/libtest/signal.cc
index ed017b2befe10ff6769435c756544a2381a9513a..42e6d78da39234032bb3736aa6df3ccfe22c5ad0 100644
(file)
--- a/
libtest/signal.cc
+++ b/
libtest/signal.cc
@@
-98,6
+98,12
@@
SignalThread::~SignalThread()
}
#endif
sem_destroy(&lock);
}
#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" {
}
extern "C" {
@@
-130,6
+136,11
@@
static void *sig_thread(void *arg)
context->set_shutdown(SHUTDOWN_FORCED);
}
break;
context->set_shutdown(SHUTDOWN_FORCED);
}
break;
+ case SIGPIPE:
+ {
+ Error << "Ignoring SIGPIPE";
+ }
+ break;
default:
Error << "Signal handling thread got unexpected signal " << strsignal(sig);
default:
Error << "Signal handling thread got unexpected signal " << strsignal(sig);
@@
-154,10
+165,14
@@
SignalThread::SignalThread() :
sigaddset(&set, SIGQUIT);
sigaddset(&set, SIGINT);
}
sigaddset(&set, SIGQUIT);
sigaddset(&set, SIGINT);
}
+ sigaddset(&set, SIGPIPE);
sigaddset(&set, SIGUSR2);
sem_init(&lock, 0, 0);
sigaddset(&set, SIGUSR2);
sem_init(&lock, 0, 0);
+
+ sigemptyset(&original_set);
+ pthread_sigmask(SIG_BLOCK, NULL, &original_set);
}
}
@@
-165,19
+180,15
@@
bool SignalThread::setup()
{
set_shutdown(SHUTDOWN_RUNNING);
{
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.";
}
{
Error << strsignal(SIGQUIT) << " has been previously set.";
}
- if (sigismember(&o
ld
_set, SIGINT))
+ if (sigismember(&o
riginal
_set, SIGINT))
{
Error << strsignal(SIGINT) << " has been previously set.";
}
{
Error << strsignal(SIGINT) << " has been previously set.";
}
- if (sigismember(&o
ld
_set, SIGUSR2))
+ if (sigismember(&o
riginal
_set, SIGUSR2))
{
Error << strsignal(SIGUSR2) << " has been previously set.";
}
{
Error << strsignal(SIGUSR2) << " has been previously set.";
}