/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * uTest, libtest
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 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
*
*/
+#include <config.h>
#include <libtest/common.h>
#include <csignal>
if (arg == SHUTDOWN_GRACEFUL)
{
- pthread_kill(thread, SIGUSR2);
-
- void *retval;
- pthread_join(thread, &retval);
+ if (pthread_kill(thread, SIGUSR2) == 0)
+ {
+ void *retval;
+ pthread_join(thread, &retval);
+ }
}
}
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, SIGUSR2));
}
+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);
+ }
+#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" {
static void *sig_thread(void *arg)
case SIGQUIT:
if (context->is_shutdown() == false)
{
- Error << "Signal handling thread got signal " << strsignal(sig);
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);
}
SignalThread::SignalThread() :
- magic_memory(MAGIC_MEMORY)
+ magic_memory(MAGIC_MEMORY),
+ thread(pthread_self())
{
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, SIGPIPE);
sigaddset(&set, SIGUSR2);
sem_init(&lock, 0, 0);
+
+ sigemptyset(&original_set);
+ pthread_sigmask(SIG_BLOCK, NULL, &original_set);
}
{
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.";
}