X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=b5e205b8e6360a46c44dfede86778c6889e89b18;hp=555ec1559763f56ee2ee0d0f70ce964bc683db58;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hpb=693fafa0e9fd606bddbd3f3054d4f8c173b33291

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 555ec155..b5e205b8 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -31,40 +31,118 @@
 #include "cliparser.h"
 
 #if defined BUILD_CORE
-#include <QCoreApplication>
 #include <QDir>
 #include "core.h"
 #include "message.h"
 
 #elif defined BUILD_QTUI
-#include <QApplication>
 #include "client.h"
+#include "qtuiapplication.h"
 #include "qtui.h"
 
 #elif defined BUILD_MONO
-#include <QApplication>
 #include "client.h"
 #include "core.h"
 #include "coresession.h"
+#include "qtuiapplication.h"
 #include "qtui.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+
 #include <signal.h>
 
+#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#include <execinfo.h>
+#include <dlfcn.h>
+#include <cxxabi.h>
+#endif
+
 //! Signal handler for graceful shutdown.
 void handle_signal(int sig) {
   qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
   QCoreApplication::quit();
 }
 
+#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+void handle_crash(int sig) {
+  Q_UNUSED(sig)
+  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);
+  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 << debugLine << "\n";
+    qDebug() << qPrintable(debugLine);
+  }
+  dumpFile.close();
+  exit(27);
+}
+#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+
+
 int main(int argc, char **argv) {
   // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
+#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+  signal(SIGABRT, handle_crash);
+  signal(SIGBUS, handle_crash);
+  signal(SIGSEGV, handle_crash);
+#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+
   Global::registerMetaTypes();
   Global::setupVersion();
 
@@ -73,10 +151,10 @@ int main(int argc, char **argv) {
   QCoreApplication app(argc, argv);
 #elif defined BUILD_QTUI
   Global::runMode = Global::ClientOnly;
-  QApplication app(argc, argv);
+  QtUiApplication app(argc, argv);
 #else
   Global::runMode = Global::Monolithic;
-  QApplication app(argc, argv);
+  QtUiApplication app(argc, argv);
 #endif
 
   Global::parser = CliParser(QCoreApplication::arguments());
@@ -87,6 +165,7 @@ int main(int argc, char **argv) {
   Global::parser.addSwitch("norestore", 'n', "Don't restore last core's state");
   Global::parser.addOption("logfile",'l',"Path to logfile");
   Global::parser.addOption("loglevel",'L',"Loglevel Debug|Info|Warning|Error","Info");
+  Global::parser.addOption("datadir", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert");
 #endif // BUILD_QTUI
 #ifndef BUILD_CORE
 // put client-only arguments here
@@ -114,7 +193,6 @@ int main(int argc, char **argv) {
         qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName()));
       else logFile.close();
     }
-    else qWarning("No logfile set - will log to stdout instead");
   }
 
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
@@ -140,6 +218,7 @@ int main(int argc, char **argv) {
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel Project");
 
+
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
@@ -147,6 +226,7 @@ int main(int argc, char **argv) {
   //Settings::init();
 
 #ifndef BUILD_CORE
+  // session resume
   QtUi *gui = new QtUi();
   Client::init(gui);
   // init gui only after the event loop has started
@@ -160,6 +240,10 @@ int main(int argc, char **argv) {
   }
 #endif
 
+#ifndef BUILD_CORE
+  app.resumeSessionIfPossible();
+#endif
+
   int exitCode = app.exec();
 
 #ifndef BUILD_QTUI