github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-13 16:53:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Simplify signal handler

Browse source 
Try to use signal-safe functions as much as possible
Closes #3995
Define sys_signame[] ourselves on linux
This commit is contained in:
Chocobo1 2015-12-13 18:14:12 +08:00
parent ebe6d1b603
commit 5c8a4b3912
1 changed files with 42 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

96
src/app/main.cpp
View file

@ -79,10 +79,15 @@ Q_IMPORT_PLUGIN(qico)
// Signal handlers // Signal handlers
#if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN) #if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
void sigintHandler(int); void sigNormalHandler(int signum);
void sigtermHandler(int); void sigAbnormalHandler(int signum);
void sigsegvHandler(int); // sys_signame[] is only defined in BSD
void sigabrtHandler(int); const char *sysSigName[] = {
"", "SIGHUP", "SIGINT", "SIGQUIT", "SIGILL", "SIGTRAP", "SIGABRT", "SIGBUS", "SIGFPE", "SIGKILL",
"SIGUSR1", "SIGSEGV", "SIGUSR2", "SIGPIPE", "SIGALRM", "SIGTERM", "SIGSTKFLT", "SIGCHLD", "SIGCONT", "SIGSTOP",
"SIGTSTP", "SIGTTIN", "SIGTTOU", "SIGURG", "SIGXCPU", "SIGXFSZ", "SIGVTALRM", "SIGPROF", "SIGWINCH", "SIGIO",
"SIGPWR", "SIGUNUSED"
};
#endif #endif
struct QBtCommandLineParameters struct QBtCommandLineParameters
@ -240,10 +245,10 @@ int main(int argc, char *argv[])
#endif #endif
#if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN) #if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
signal(SIGABRT, sigabrtHandler); signal(SIGINT, sigNormalHandler);
signal(SIGTERM, sigtermHandler); signal(SIGTERM, sigNormalHandler);
signal(SIGINT, sigintHandler); signal(SIGABRT, sigAbnormalHandler);
signal(SIGSEGV, sigsegvHandler); signal(SIGSEGV, sigAbnormalHandler);
#endif #endif
return app->exec(params.torrents); return app->exec(params.torrents);
@ -303,58 +308,41 @@ QBtCommandLineParameters parseCommandLine()
} }
#if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN) #if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
void sigintHandler(int) void sigNormalHandler(int signum)
{ {
signal(SIGINT, 0);
qDebug("Catching SIGINT, exiting cleanly");
qApp->exit();
}
void sigtermHandler(int)
{
signal(SIGTERM, 0);
qDebug("Catching SIGTERM, exiting cleanly");
qApp->exit();
}
void sigsegvHandler(int)
{
signal(SIGABRT, 0);
signal(SIGSEGV, 0);
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU #if !defined Q_OS_WIN && !defined Q_OS_HAIKU
std::cerr << "\n\n*************************************************************\n"; const char str1[] = "Catching signal: ";
std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n"; const char *sigName = sysSigName[signum];
std::cerr << "qBittorrent version: " << VERSION << std::endl; const char str2[] = "\nExiting cleanly\n";
print_stacktrace(); write(STDERR_FILENO, str1, strlen(str1));
#else write(STDERR_FILENO, sigName, strlen(sigName));
write(STDERR_FILENO, str2, strlen(str2));
#endif // !defined Q_OS_WIN && !defined Q_OS_HAIKU
signal(signum, SIG_DFL);
qApp->exit(); // unsafe, but exit anyway
}
void sigAbnormalHandler(int signum)
{
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
const char str1[] = "\n\n*************************************************************\nCatching signal: ";
const char *sigName = sysSigName[signum];
const char str2[] = "\nPlease file a bug report at http://bug.qbittorrent.org and provide the following information:\n\n"
"qBittorrent version: " VERSION "\n";
write(STDERR_FILENO, str1, strlen(str1));
write(STDERR_FILENO, sigName, strlen(sigName));
write(STDERR_FILENO, str2, strlen(str2));
print_stacktrace(); // unsafe
#endif // !defined Q_OS_WIN && !defined Q_OS_HAIKU
#ifdef STACKTRACE_WIN #ifdef STACKTRACE_WIN
StraceDlg dlg; StraceDlg dlg; // unsafe
dlg.setStacktraceString(straceWin::getBacktrace()); dlg.setStacktraceString(straceWin::getBacktrace());
dlg.exec(); dlg.exec();
#endif #endif // STACKTRACE_WIN
#endif signal(signum, SIG_DFL);
raise(SIGSEGV); raise(signum);
} }
#endif // defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
void sigabrtHandler(int)
{
signal(SIGABRT, 0);
signal(SIGSEGV, 0);
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
std::cerr << "\n\n*************************************************************\n";
std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
std::cerr << "qBittorrent version: " << VERSION << std::endl;
print_stacktrace();
#else
#ifdef STACKTRACE_WIN
StraceDlg dlg;
dlg.setStacktraceString(straceWin::getBacktrace());
dlg.exec();
#endif
#endif
raise(SIGABRT);
}
#endif
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
void showSplashScreen() void showSplashScreen()