projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
jenkins-promote-staging-trunk-libmemcached-7
[m6w6/libmemcached]
/
libtest
/
signal.cc
diff --git
a/libtest/signal.cc
b/libtest/signal.cc
index 50234d8d9b1921a47ed821fce4b86959f3cf05a0..04d06b3642752a5db31bd38f52a5519c60bc2140 100644
(file)
--- a/
libtest/signal.cc
+++ b/
libtest/signal.cc
@@
-20,6
+20,7
@@
*/
*/
+#include <config.h>
#include <libtest/common.h>
#include <csignal>
#include <libtest/common.h>
#include <csignal>
@@
-74,7
+75,7
@@
void SignalThread::post()
void SignalThread::test()
{
assert(magic_memory == MAGIC_MEMORY);
void SignalThread::test()
{
assert(magic_memory == MAGIC_MEMORY);
- if (
not getenv("LIBTEST_IN_GDB")
)
+ if (
bool(getenv("LIBTEST_IN_GDB")) == false
)
{
assert(sigismember(&set, SIGABRT));
assert(sigismember(&set, SIGQUIT));
{
assert(sigismember(&set, SIGABRT));
assert(sigismember(&set, SIGQUIT));
@@
-85,12
+86,25
@@
void SignalThread::test()
SignalThread::~SignalThread()
{
SignalThread::~SignalThread()
{
+ if (is_shutdown() == false)
+ {
+ 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);
}
if (pthread_equal(thread, pthread_self()) != 0 and (pthread_kill(thread, 0) == ESRCH) == true)
{
void *retval;
pthread_join(thread, &retval);
}
+#endif
sem_destroy(&lock);
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" {
@@
-123,6
+137,15
@@
static void *sig_thread(void *arg)
context->set_shutdown(SHUTDOWN_FORCED);
}
break;
context->set_shutdown(SHUTDOWN_FORCED);
}
break;
+ case SIGPIPE:
+ {
+ Error << "Ignoring SIGPIPE";
+ }
+ break;
+
+ case 0:
+ Error << "Inside of gdb";
+ break;
default:
Error << "Signal handling thread got unexpected signal " << strsignal(sig);
default:
Error << "Signal handling thread got unexpected signal " << strsignal(sig);
@@
-141,16
+164,20
@@
SignalThread::SignalThread() :
{
pthread_mutex_init(&shutdown_mutex, NULL);
sigemptyset(&set);
{
pthread_mutex_init(&shutdown_mutex, NULL);
sigemptyset(&set);
- if (
not getenv("LIBTEST_IN_GDB")
)
+ if (
bool(getenv("LIBTEST_IN_GDB")) == false
)
{
sigaddset(&set, SIGABRT);
sigaddset(&set, SIGQUIT);
sigaddset(&set, SIGINT);
}
{
sigaddset(&set, SIGABRT);
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);
}
}
@@
-158,19
+185,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.";
}