File 0001-Add-gdb-backtrace-support-on-Windows-for-m... of Package mingw32-kdebase4-runtime

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Add-gdb-backtrace-support-on-Windows-for-mingw-builds.txt of Package mingw32-kdebase4-runtime (Revision eb708924d1dfc19153edc278c966e6d5)

Currently displaying revision eb708924d1dfc19153edc278c966e6d5 , Show latest

From 0132246f4303385998b19764bc3fe7bb424f0423 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 7 May 2018 12:30:31 +0200
Subject: [PATCH] Add gdb backtrace support on Windows for mingw builds

diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt
index 39833d7e33..615a684927 100644
--- a/drkonqi/CMakeLists.txt
+++ b/drkonqi/CMakeLists.txt
@@ -23,7 +23,7 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1410)
 add_subdirectory( data )
 add_subdirectory( parser )
 add_subdirectory( tests )
-if ( WIN32 )
+if ( WIN32 AND MSVC)
     add_subdirectory( kdbgwin )
 endif ( WIN32 )
 
diff --git a/drkonqi/crashedapplication.cpp b/drkonqi/crashedapplication.cpp
index ef63232bdd..7664e10fa5 100644
--- a/drkonqi/crashedapplication.cpp
+++ b/drkonqi/crashedapplication.cpp
@@ -141,6 +141,11 @@ int CrashedApplication::thread() const
     return m_thread;
 }
 
+int CrashedApplication::event() const
+{
+    return m_event;
+}
+
 const QDateTime& CrashedApplication::datetime() const
 {
     return m_datetime;
diff --git a/drkonqi/crashedapplication.h b/drkonqi/crashedapplication.h
index 59672f8775..79faf748d7 100644
--- a/drkonqi/crashedapplication.h
+++ b/drkonqi/crashedapplication.h
@@ -64,6 +64,8 @@ public:
 
     int thread() const;
 
+    int event() const;
+
     const QDateTime& datetime() const;
 
 public slots:
@@ -85,6 +87,7 @@ protected:
     BugReportAddress m_reportAddress;
     bool m_restarted;
     int m_thread;
+    int m_event;
     QDateTime m_datetime;
 };
 
diff --git a/drkonqi/data/debuggers/internal/gdbrc b/drkonqi/data/debuggers/internal/gdbrc
index 322c5b3c98..5d512f028c 100644
--- a/drkonqi/data/debuggers/internal/gdbrc
+++ b/drkonqi/data/debuggers/internal/gdbrc
@@ -76,5 +76,5 @@ TryExec=gdb
 Backends=KCrash
 
 [KCrash]
-Exec=gdb -nw -n -batch -x %tempfile -p %pid %execpath
+Exec=gdb -nw -n -batch -x %tempfile -ex \"attach %pid\" -ex \"signal-event %event\" -ex \"continue\" %execpath
 BatchCommands=set width 200\nthread\nthread apply all bt
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 26ca3389c1..6b76bdd980 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -119,6 +119,7 @@ void Debugger::expandString(QString & str, ExpandStringUsage usage, const QStrin
     map[QLatin1String("pid")] = QString::number(appInfo->pid());
     map[QLatin1String("tempfile")] = tempFile;
     map[QLatin1String("thread")] = QString::number(appInfo->thread());
+    map[QLatin1String("event")] = QString::number(appInfo->event());
 
     if (usage == ExpansionUsageShell) {
         str = KMacroExpander::expandMacrosShellQuote(str, map);
diff --git a/drkonqi/drkonqibackends.cpp b/drkonqi/drkonqibackends.cpp
index 064d07d48f..0597e0fa71 100644
--- a/drkonqi/drkonqibackends.cpp
+++ b/drkonqi/drkonqibackends.cpp
@@ -129,6 +129,7 @@ CrashedApplication *KCrashBackend::constructCrashedApplication()
     a->m_signalNumber = args->getOption("signal").toInt();
     a->m_restarted = args->isSet("restarted");
     a->m_thread = args->getOption("thread").toInt();
+    a->m_event = args->getOption("signal-event").toInt();
 
     //try to determine the executable that crashed
     if ( QFileInfo(QString("/proc/%1/exe").arg(a->m_pid)).exists() ) {
@@ -168,7 +169,7 @@ DebuggerManager *KCrashBackend::constructDebuggerManager()
 {
     QList<Debugger> internalDebuggers = Debugger::availableInternalDebuggers("KCrash");
     KConfigGroup config(KGlobal::config(), "DrKonqi");
-#ifndef Q_OS_WIN
+#ifndef Q_CC_MSVC
     QString defaultDebuggerName = config.readEntry("Debugger", QString("gdb"));
 #else
     QString defaultDebuggerName = config.readEntry("Debugger", QString("kdbgwin"));
diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp
index 4deed2c99a..b17c4dc791 100644
--- a/drkonqi/main.cpp
+++ b/drkonqi/main.cpp
@@ -91,6 +91,7 @@ int main(int argc, char* argv[])
     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"));
+    options.add("signal-event <event>", ki18nc("@info:shell","The event ID that the crashed program expects to continue"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     KComponentData inst(KCmdLineArgs::aboutData());
-- 
2.13.6

Places

File 0001-Add-gdb-backtrace-support-on-Windows-for-mingw-builds.txt of Package mingw32-kdebase4-runtime (Revision eb708924d1dfc19153edc278c966e6d5)

Places