Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1547698 - Remove unused and non-public bits from the exception handler r=froydnj

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D31066

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Gabriele Svelto 2019-05-15 13:09:31 +00:00
parent f7b311b4a9
commit ac81f9bda7
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/crashreporter/nsDummyExceptionHandler.cpp
View File

@ -205,9 +205,6 @@ bool TakeMinidumpForChild(uint32_t childPid, nsIFile** dump,
return false; return false;
} }
void RenameAdditionalHangMinidump(nsIFile* minidump, nsIFile* childMinidump,
const nsACString& name) {}
ThreadId CurrentThreadId() { return -1; } ThreadId CurrentThreadId() { return -1; }
bool TakeMinidump(nsIFile** aResult, bool aMoveToPending) { return false; } bool TakeMinidump(nsIFile** aResult, bool aMoveToPending) { return false; }

17
toolkit/crashreporter/nsExceptionHandler.cpp
View File

@ -182,8 +182,6 @@ typedef std::string xpstring;
static const XP_CHAR dumpFileExtension[] = XP_TEXT(".dmp"); static const XP_CHAR dumpFileExtension[] = XP_TEXT(".dmp");
#endif #endif
static const XP_CHAR childCrashAnnotationBaseName[] =
XP_TEXT("GeckoChildCrash");
static const XP_CHAR extraFileExtension[] = XP_TEXT(".extra"); static const XP_CHAR extraFileExtension[] = XP_TEXT(".extra");
static const XP_CHAR memoryReportExtension[] = XP_TEXT(".memory.json.gz"); static const XP_CHAR memoryReportExtension[] = XP_TEXT(".memory.json.gz");
static xpstring* defaultMemoryReportPath = nullptr; static xpstring* defaultMemoryReportPath = nullptr;
@ -3333,8 +3331,19 @@ bool TakeMinidumpForChild(uint32_t childPid, nsIFile** dump,
// CreatePairedMinidumps() and helpers // CreatePairedMinidumps() and helpers
// //
void RenameAdditionalHangMinidump(nsIFile* minidump, nsIFile* childMinidump, /*
const nsACString& name) { * Renames the stand alone dump file aDumpFile to:
* |aOwnerDumpFile-aDumpFileProcessType.dmp|
* and moves it into the same directory as aOwnerDumpFile. Does not
* modify aOwnerDumpFile in any way.
*
* @param aDumpFile - the dump file to associate with aOwnerDumpFile.
* @param aOwnerDumpFile - the new owner of aDumpFile.
* @param aDumpFileProcessType - process name associated with aDumpFile.
*/
static void RenameAdditionalHangMinidump(nsIFile* minidump,
nsIFile* childMinidump,
const nsACString& name) {
nsCOMPtr<nsIFile> directory; nsCOMPtr<nsIFile> directory;
childMinidump->GetParent(getter_AddRefs(directory)); childMinidump->GetParent(getter_AddRefs(directory));
if (!directory) return; if (!directory) return;

14
toolkit/crashreporter/nsExceptionHandler.h
View File

@ -128,20 +128,6 @@ bool GetExtraFileForMinidump(nsIFile* minidump, nsIFile** extraFile);
bool AppendExtraData(const nsAString& id, const AnnotationTable& data); bool AppendExtraData(const nsAString& id, const AnnotationTable& data);
bool AppendExtraData(nsIFile* extraFile, const AnnotationTable& data); bool AppendExtraData(nsIFile* extraFile, const AnnotationTable& data);
/*
* Renames the stand alone dump file aDumpFile to:
* |aOwnerDumpFile-aDumpFileProcessType.dmp|
* and moves it into the same directory as aOwnerDumpFile. Does not
* modify aOwnerDumpFile in any way.
*
* @param aDumpFile - the dump file to associate with aOwnerDumpFile.
* @param aOwnerDumpFile - the new owner of aDumpFile.
* @param aDumpFileProcessType - process name associated with aDumpFile.
*/
void RenameAdditionalHangMinidump(nsIFile* aDumpFile,
const nsIFile* aOwnerDumpFile,
const nsACString& aDumpFileProcessType);
#ifdef XP_WIN #ifdef XP_WIN
nsresult WriteMinidumpForException(EXCEPTION_POINTERS* aExceptionInfo); nsresult WriteMinidumpForException(EXCEPTION_POINTERS* aExceptionInfo);
#endif #endif