[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/drkonqi
From:       Ilie Halip <lupuroshu () gmail ! com>
Date:       2010-08-09 8:25:53
Message-ID: 20100809082553.EDF59AC84E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1160911 by ihalip:

merged work/soc-drkonqi branch back to trunk

 M  +15 -0     CMakeLists.txt  
 M  +6 -1      crashedapplication.cpp  
 M  +3 -0      crashedapplication.h  
 M  +1 -0      debugger.cpp  
 M  +5 -0      drkonqibackends.cpp  
 A             kdbgwin (directory)  
 A             kdbgwin/CMakeLists.txt  
 A             kdbgwin/Doxyfile  
 A             kdbgwin/abstract_generator.cpp   [License: LGPL]
 A             kdbgwin/abstract_generator.h   [License: LGPL]
 A             kdbgwin/callbacks.cpp   [License: LGPL]
 A             kdbgwin/callbacks.h   [License: LGPL]
 A             kdbgwin/common.h   [License: LGPL]
 A             kdbgwin/main.cpp   [License: LGPL]
 A             kdbgwin/mingw_generator.cpp   [License: LGPL]
 A             kdbgwin/mingw_generator.h   [License: LGPL]
 A             kdbgwin/msvc_generator.cpp   [License: LGPL]
 A             kdbgwin/msvc_generator.h   [License: LGPL]
 A             kdbgwin/outputters.cpp   [License: LGPL]
 A             kdbgwin/outputters.h   [License: LGPL]
 A             kdbgwin/process.cpp   [License: LGPL]
 A             kdbgwin/process.h   [License: LGPL]
 M  +1 -0      main.cpp  


--- trunk/KDE/kdebase/runtime/drkonqi/CMakeLists.txt #1160910:1160911
@@ -1,3 +1,15 @@
+project(drkonqi) 
+
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include(CheckFunctionExists)
+include(CheckIncludeFiles)
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
+
+
+
 check_function_exists("strsignal" HAVE_STRSIGNAL)
 check_function_exists("uname" HAVE_UNAME)
 
@@ -11,6 +23,9 @@
 
 add_subdirectory( data ) 
 add_subdirectory( tests ) 
+if ( WIN32 )
+    add_subdirectory( kdbgwin ) 
+endif ( WIN32 )
 
 set(drkonqi_SRCS 
     main.cpp
--- trunk/KDE/kdebase/runtime/drkonqi/crashedapplication.cpp #1160910:1160911
@@ -96,7 +96,7 @@
     case SIGABRT: return QLatin1String("SIGABRT");
     case SIGFPE: return QLatin1String("SIGFPE");
     case SIGSEGV: return QLatin1String("SIGSEGV");
-    case SIGBUS: return QLatin1String("SIGBUS");
+    //case SIGBUS: return QLatin1String("SIGBUS");
     default: return QLatin1String("Unknown");
     }
 #endif
@@ -107,6 +107,11 @@
     return m_restarted;
 }
 
+int CrashedApplication::thread() const
+{
+    return m_thread;
+}
+
 void CrashedApplication::restart()
 {
     if (!m_restarted) {
--- trunk/KDE/kdebase/runtime/drkonqi/crashedapplication.h #1160910:1160911
@@ -60,6 +60,8 @@
 
     bool hasBeenRestarted() const;
 
+    int thread() const;
+
 public slots:
     void restart();
 
@@ -78,6 +80,7 @@
     QString m_version;
     BugReportAddress m_reportAddress;
     bool m_restarted;
+    int m_thread;
 };
 
 #endif // CRASHEDAPPLICATION_H
--- trunk/KDE/kdebase/runtime/drkonqi/debugger.cpp #1160910:1160911
@@ -117,6 +117,7 @@
     map[QLatin1String("signame")] = appInfo->signalName();
     map[QLatin1String("pid")] = QString::number(appInfo->pid());
     map[QLatin1String("tempfile")] = tempFile;
+    map[QLatin1String("thread")] = QString::number(appInfo->thread());
 
     if (usage == ExpansionUsageShell) {
         str = KMacroExpander::expandMacrosShellQuote(str, map);
--- trunk/KDE/kdebase/runtime/drkonqi/drkonqibackends.cpp #1160910:1160911
@@ -126,6 +126,7 @@
     a->m_pid = args->getOption("pid").toInt();
     a->m_signalNumber = args->getOption("signal").toInt();
     a->m_restarted = args->isSet("restarted");
+    a->m_thread = args->getOption("thread").toInt();
 
     //try to determine the executable that crashed
     if ( QFileInfo(QString("/proc/%1/exe").arg(a->m_pid)).exists() ) {
@@ -163,7 +164,11 @@
 {
     QList<Debugger> internalDebuggers = Debugger::availableInternalDebuggers("KCrash");
     KConfigGroup config(KGlobal::config(), "drkonqi");
+#ifndef Q_OS_WIN
     QString defaultDebuggerName = config.readEntry("Debugger", QString("gdb"));
+#else
+    QString defaultDebuggerName = config.readEntry("Debugger", QString("kdbgwin"));
+#endif
 
     Debugger firstKnownGoodDebugger, preferredDebugger;
     foreach (const Debugger & debugger, internalDebuggers) {
--- trunk/KDE/kdebase/runtime/drkonqi/main.cpp #1160910:1160911
@@ -86,6 +86,7 @@
     options.add("restarted", ki18nc("@info:shell","The program has already been restarted"));
     options.add("keeprunning", ki18nc("@info:shell","Keep the program running and generate "
                                                     "the backtrace at startup"));
+    options.add("thread <threadid>", ki18nc("@info:shell","The thread id of the failing thread"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     KComponentData inst(KCmdLineArgs::aboutData());
[prev in list] [next in list] [prev in thread] [next in thread]