From 9f7b92eccd6dfca201cbef9d947103d7b9016b8d Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 1 Feb 2016 14:50:07 +0300 Subject: [PATCH 1/2] improved minidump choosing when sending crash report --- Telegram/SourceFiles/logs.cpp | 32 +++++++++++++++++++ Telegram/SourceFiles/logs.h | 1 + Telegram/SourceFiles/window.cpp | 56 ++++++++++++++++++++------------- 3 files changed, 68 insertions(+), 21 deletions(-) diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index bebdd736b..54e754364 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -600,6 +600,19 @@ namespace SignalHandlers { return stream; } + const dump &operator<<(const dump &stream, const wchar_t *str) { + if (!CrashDumpFile) return stream; + + for (int i = 0, l = wcslen(str); i < l; ++i) { + if (str[i] >= 0 && str[i] < 128) { + _writeChar(char(str[i])); + } else { + _writeChar('?'); + } + } + return stream; + } + template const dump &_writeNumber(const dump &stream, Type number) { if (!CrashDumpFile) return stream; @@ -658,6 +671,9 @@ namespace SignalHandlers { bool LoggingCrashHeaderWritten = false; QMutex LoggingCrashMutex; + const char *BreakpadDumpPath = 0; + const wchar_t *BreakpadDumpPathW = 0; + // see https://github.com/benbjohnson/bandicoot #if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64 struct sigaction SIG_def[32]; @@ -720,6 +736,11 @@ namespace SignalHandlers { dump() << "Caught signal " << signum << " (" << name << ") in thread " << uint64(thread) << "\n"; } else if (signum == -1) { dump() << "Google Breakpad caught a crash, minidump written in thread " << uint64(thread) << "\n"; + if (BreakpadDumpPath) { + dump() << "Minidump: " << BreakpadDumpPath << "\n"; + } else if (BreakpadDumpPathW) { + dump() << "Minidump: " << BreakpadDumpPathW << "\n"; + } } else { dump() << "Caught signal " << signum << " in thread " << uint64(thread) << "\n"; } @@ -809,7 +830,18 @@ namespace SignalHandlers { bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success) #endif { +#ifdef Q_OS_WIN + BreakpadDumpPathW = _minidump_id; + Handler(-1); +#else + +#ifdef Q_OS_MAC + BreakpadDumpPath = _minidump_id; +#else + BreakpadDumpPath = md.path(); +#endif Handler(-1, 0, 0); +#endif return success; } diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h index 9deebadb1..e8e2c9998 100644 --- a/Telegram/SourceFiles/logs.h +++ b/Telegram/SourceFiles/logs.h @@ -92,6 +92,7 @@ namespace SignalHandlers { ~dump(); }; const dump &operator<<(const dump &stream, const char *str); + const dump &operator<<(const dump &stream, const wchar_t *str); const dump &operator<<(const dump &stream, int num); const dump &operator<<(const dump &stream, unsigned int num); const dump &operator<<(const dump &stream, unsigned long num); diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp index d4ae8fc39..9e3c8ccff 100644 --- a/Telegram/SourceFiles/window.cpp +++ b/Telegram/SourceFiles/window.cpp @@ -2018,28 +2018,42 @@ LastCrashedWindow::LastCrashedWindow() { if (_sendingState != SendingNoReport) { - QString maxDump, maxDumpFull; - QDateTime maxDumpModified, workingModified = QFileInfo(cWorkingDir() + qsl("tdata/working")).lastModified(); - qint64 maxDumpSize = 0; - QFileInfoList list = QDir(cWorkingDir() + qsl("tdumps")).entryInfoList(); - for (int32 i = 0, l = list.size(); i < l; ++i) { - QString name = list.at(i).fileName(); - if (name.endsWith(qstr(".dmp"))) { - QDateTime modified = list.at(i).lastModified(); - if (maxDump.isEmpty() || qAbs(workingModified.secsTo(modified)) < qAbs(workingModified.secsTo(maxDumpModified))) { - maxDump = name; - maxDumpModified = modified; - maxDumpFull = list.at(i).absoluteFilePath(); - maxDumpSize = list.at(i).size(); - } - } - } - if (!maxDump.isEmpty() && qAbs(workingModified.secsTo(maxDumpModified)) < 10) { - _minidumpName = maxDump; - _minidumpFull = maxDumpFull; - } + qint64 dumpSize = 0; + QString possibleDump = getReportField(qstr("minidump"), qstr("Minidump:")); + if (!possibleDump.isEmpty()) { + if (!possibleDump.startsWith('/')) { + possibleDump = cWorkingDir() + qsl("tdumps/") + possibleDump; + } + QFileInfo possibleInfo(possibleDump); + if (possibleInfo.exists()) { + _minidumpName = possibleInfo.fileName(); + _minidumpFull = possibleInfo.absoluteFilePath(); + dumpSize = possibleInfo.size(); + } + } + if (_minidumpFull.isEmpty()) { + QString maxDump, maxDumpFull; + QDateTime maxDumpModified, workingModified = QFileInfo(cWorkingDir() + qsl("tdata/working")).lastModified(); + QFileInfoList list = QDir(cWorkingDir() + qsl("tdumps")).entryInfoList(); + for (int32 i = 0, l = list.size(); i < l; ++i) { + QString name = list.at(i).fileName(); + if (name.endsWith(qstr(".dmp"))) { + QDateTime modified = list.at(i).lastModified(); + if (maxDump.isEmpty() || qAbs(workingModified.secsTo(modified)) < qAbs(workingModified.secsTo(maxDumpModified))) { + maxDump = name; + maxDumpModified = modified; + maxDumpFull = list.at(i).absoluteFilePath(); + dumpSize = list.at(i).size(); + } + } + } + if (!maxDump.isEmpty() && qAbs(workingModified.secsTo(maxDumpModified)) < 10) { + _minidumpName = maxDump; + _minidumpFull = maxDumpFull; + } + } - _minidump.setText(qsl("+ %1 (%2 KB)").arg(_minidumpName).arg(maxDumpSize / 1024)); + _minidump.setText(qsl("+ %1 (%2 KB)").arg(_minidumpName).arg(dumpSize / 1024)); } _networkSettings.setText(qsl("NETWORK SETTINGS")); From 44c12064a65847b0451b9ea7c14e3fb20841f7ae Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 1 Feb 2016 15:09:23 +0300 Subject: [PATCH 2/2] fixed crash reports for windows --- Telegram/SourceFiles/logs.cpp | 2 +- Telegram/SourceFiles/window.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index 54e754364..78c6f4437 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -19,7 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org */ #include "stdafx.h" -#include +#include #include "pspecific.h" // see https://blog.inventic.eu/2012/08/qt-and-google-breakpad/ diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp index 9e3c8ccff..e675b15bb 100644 --- a/Telegram/SourceFiles/window.cpp +++ b/Telegram/SourceFiles/window.cpp @@ -2024,6 +2024,9 @@ LastCrashedWindow::LastCrashedWindow() if (!possibleDump.startsWith('/')) { possibleDump = cWorkingDir() + qsl("tdumps/") + possibleDump; } + if (!possibleDump.endsWith('.dmp')) { + possibleDump += qsl(".dmp"); + } QFileInfo possibleInfo(possibleDump); if (possibleInfo.exists()) { _minidumpName = possibleInfo.fileName();