summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c013d41)
Unix signal handlers require e.g. command line options, which are
not available at construction time of the Quassel instance.
Move signal handler registration into init().
Add TODO comments to remind us of the fact that we're not supposed
to use unsafe methods in signal handlers (which we currently do),
and should rework signal handling to be safe.
+}
+
+
+bool Quassel::init()
+{
+ if (instance()->_initialized)
+ return true; // allow multiple invocations because of MonolithicApplication
+
+ // Setup signal handling
+ // TODO: Don't use unsafe methods, see handleSignal()
+
// We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
// We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
// Windows does not support SIGHUP
signal(SIGHUP, handleSignal);
#endif
// Windows does not support SIGHUP
signal(SIGHUP, handleSignal);
#endif
-}
-
-
-bool Quassel::init()
-{
- if (instance()->_initialized)
- return true; // allow multiple invocations because of MonolithicApplication
if (instance()->_handleCrashes) {
// we have crashhandler for win32 and unix (based on execinfo).
if (instance()->_handleCrashes) {
// we have crashhandler for win32 and unix (based on execinfo).
if (rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
# endif /* Q_OS_WIN */
if (rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
# endif /* Q_OS_WIN */
- signal(SIGABRT, handleSignal);
- signal(SIGSEGV, handleSignal);
+ signal(SIGABRT, handleSignal);
+ signal(SIGSEGV, handleSignal);
- signal(SIGBUS, handleSignal);
- }
- free(limit);
+ signal(SIGBUS, handleSignal);
+ }
+ free(limit);
# endif /* Q_OS_WIN */
#endif /* Q_OS_WIN || HAVE_EXECINFO */
}
# endif /* Q_OS_WIN */
#endif /* Q_OS_WIN || HAVE_EXECINFO */
}
//! Signal handler for graceful shutdown.
//! Signal handler for graceful shutdown.
+//! @todo: Ensure this doesn't use unsafe methods (it does currently)
+//! cf. QSocketNotifier, UnixSignalWatcher
void Quassel::handleSignal(int sig)
{
switch (sig) {
void Quassel::handleSignal(int sig)
{
switch (sig) {