X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=57d60333f97d1420e754551379b7d475841a85d9;hp=f1d37c5c2d8d1150593295450327632bd1a32b8c;hb=af5ee11e78a6c98f755d0cc5e3bef77028b227dd;hpb=f12ff6555fc60d165d5057902a91cdff355816b9 diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index f1d37c5c..57d60333 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -34,37 +34,28 @@ #include "types.h" #include "syncableobject.h" -#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) -# define BUILD_CRASHHANDLER -# include -# include -# include -#endif - Quassel::BuildInfo Quassel::_buildInfo; -CliParser *Quassel::_cliParser = 0; +AbstractCliParser *Quassel::_cliParser = 0; Quassel::RunMode Quassel::_runMode; bool Quassel::_initialized = false; bool Quassel::DEBUG = false; +QString Quassel::_coreDumpFileName; Quassel::Quassel() { - Q_INIT_RESOURCE(i18n); - // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel. signal(SIGTERM, handleSignal); signal(SIGINT, handleSignal); -#ifdef BUILD_CRASHHANDLER + // we have crashhandler for win32 and unix (based on execinfo). + // on mac os we use it's integrated backtrace generator +#if defined(Q_OS_WIN32) || (defined(HAVE_EXECINFO) && !defined(Q_OS_MAC)) signal(SIGABRT, handleSignal); - signal(SIGBUS, handleSignal); signal(SIGSEGV, handleSignal); -#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) - - _cliParser = new CliParser(); +# ifndef Q_OS_WIN32 + signal(SIGBUS, handleSignal); +# endif +#endif - // put shared client&core arguments here - cliParser()->addSwitch("debug",'d', tr("Enable debug output")); - cliParser()->addSwitch("help",'h', tr("Display this help and exit")); } Quassel::~Quassel() { @@ -72,25 +63,23 @@ Quassel::~Quassel() { } bool Quassel::init() { - if(_initialized) return true; // allow multiple invocations because of MonolithicApplication + if(_initialized) + return true; // allow multiple invocations because of MonolithicApplication + _initialized = true; qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); registerMetaTypes(); - setupTranslations(); - - QCoreApplication::setApplicationName(buildInfo().applicationName); - QCoreApplication::setOrganizationName(buildInfo().organizationName); - QCoreApplication::setOrganizationDomain(buildInfo().organizationDomain); Network::setDefaultCodecForServer("ISO-8859-1"); Network::setDefaultCodecForEncoding("UTF-8"); Network::setDefaultCodecForDecoding("ISO-8859-15"); - if(!cliParser()->parse(QCoreApplication::arguments()) || isOptionSet("help")) { + if(isOptionSet("help")) { cliParser()->usage(); return false; } + DEBUG = isOptionSet("debug"); return true; } @@ -105,6 +94,7 @@ void Quassel::registerMetaTypes() { qRegisterMetaType("Message"); qRegisterMetaType("BufferInfo"); qRegisterMetaType("NetworkInfo"); + qRegisterMetaType("Network::Server"); qRegisterMetaType("Identity"); qRegisterMetaType("Network::ConnectionState"); @@ -112,6 +102,7 @@ void Quassel::registerMetaTypes() { qRegisterMetaTypeStreamOperators("Message"); qRegisterMetaTypeStreamOperators("BufferInfo"); qRegisterMetaTypeStreamOperators("NetworkInfo"); + qRegisterMetaTypeStreamOperators("Network::Server"); qRegisterMetaTypeStreamOperators("Identity"); qRegisterMetaTypeStreamOperators("Network::ConnectionState"); @@ -130,21 +121,6 @@ void Quassel::registerMetaTypes() { qRegisterMetaTypeStreamOperators("MsgId"); } -void Quassel::setupTranslations() { - // Set up i18n support - QLocale locale = QLocale::system(); - - QTranslator *qtTranslator = new QTranslator(qApp); - qtTranslator->setObjectName("QtTr"); - qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name())); - qApp->installTranslator(qtTranslator); - - QTranslator *quasselTranslator = new QTranslator(qApp); - quasselTranslator->setObjectName("QuasselTr"); - quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name())); - qApp->installTranslator(quasselTranslator); -} - void Quassel::setupBuildInfo(const QString &generated) { _buildInfo.applicationName = "Quassel IRC"; _buildInfo.coreApplicationName = "Quassel Core"; @@ -204,84 +180,48 @@ void Quassel::setupBuildInfo(const QString &generated) { //! Signal handler for graceful shutdown. void Quassel::handleSignal(int sig) { switch(sig) { - case SIGTERM: - case SIGINT: - qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig))); - QCoreApplication::quit(); - break; - -#ifdef BUILD_CRASHHANDLER - case SIGABRT: - case SIGBUS: - case SIGSEGV: - handleCrash(); + case SIGTERM: + case SIGINT: + qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig))); + QCoreApplication::quit(); + break; + case SIGABRT: + case SIGSEGV: +#ifndef Q_OS_WIN32 + case SIGBUS: #endif - break; - default: - break; + logBacktrace(coreDumpFileName()); + exit(EXIT_FAILURE); + break; + default: + break; } } -void Quassel::handleCrash() { -#ifdef BUILD_CRASHHANDLER - void* callstack[128]; - int i, frames = backtrace(callstack, 128); - - QFile dumpFile(QString("Quassel-Crash-%1").arg(QDateTime::currentDateTime().toString("yyyyMMdd-hhmm.log"))); - dumpFile.open(QIODevice::WriteOnly); +void Quassel::logFatalMessage(const char *msg) { +#ifdef Q_OS_MAC + Q_UNUSED(msg) +#else + QFile dumpFile(coreDumpFileName()); + dumpFile.open(QIODevice::Append); QTextStream dumpStream(&dumpFile); - for (i = 0; i < frames; ++i) { - Dl_info info; - dladdr (callstack[i], &info); - // as a reference: - // typedef struct - // { - // __const char *dli_fname; /* File name of defining object. */ - // void *dli_fbase; /* Load address of that object. */ - // __const char *dli_sname; /* Name of nearest symbol. */ - // void *dli_saddr; /* Exact value of nearest symbol. */ - // } Dl_info; - - #if __LP64__ - int addrSize = 16; - #else - int addrSize = 8; - #endif - - QString funcName; - if(info.dli_sname) { - char *func = abi::__cxa_demangle(info.dli_sname, 0, 0, 0); - if(func) { - funcName = QString(func); - free(func); - } else { - funcName = QString(info.dli_sname); - } - } else { - funcName = QString("0x%1").arg((long)info.dli_saddr, addrSize, QLatin1Char('0')); - } - - // prettificating the filename - QString fileName("???"); - if(info.dli_fname) { - fileName = QString(info.dli_fname); - int slashPos = fileName.lastIndexOf('/'); - if(slashPos != -1) - fileName = fileName.mid(slashPos + 1); - if(fileName.count() < 20) - fileName += QString(20 - fileName.count(), ' '); - } - - QString debugLine = QString("#%1 %2 0x%3 %4").arg(i, 3, 10) - .arg(fileName) - .arg((long)(callstack[i]), addrSize, 16, QLatin1Char('0')) - .arg(funcName); + dumpStream << "Fatal: " << msg << '\n'; + dumpStream.flush(); + dumpFile.close(); +#endif +} - dumpStream << debugLine << "\n"; - qDebug() << qPrintable(debugLine); +const QString &Quassel::coreDumpFileName() { + if(_coreDumpFileName.isEmpty()) { + _coreDumpFileName = QString("Quassel-Crash-%1.log").arg(QDateTime::currentDateTime().toString("yyyyMMdd-hhmm")); + QFile dumpFile(_coreDumpFileName); + dumpFile.open(QIODevice::Append); + QTextStream dumpStream(&dumpFile); + dumpStream << "Quassel IRC: " << _buildInfo.baseVersion << ' ' << _buildInfo.commitHash << '\n'; + qDebug() << "Quassel IRC: " << _buildInfo.baseVersion << ' ' << _buildInfo.commitHash; + dumpStream.flush(); + dumpFile.close(); } - dumpFile.close(); - exit(27); -#endif /* BUILD_CRASHHANDLER */ + return _coreDumpFileName; }