wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 946799 part A - annotate the location and size of the breakpad memory reservation, r=ted

Browse Source
This commit is contained in:
Benjamin Smedberg 2013-12-06 09:00:06 -05:00
parent 8ed6b44503
commit 363b268049
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
toolkit/crashreporter/nsExceptionHandler.cpp
View File

@ -221,6 +221,16 @@ static const char kIsGarbageCollectingParameter[] = "IsGarbageCollecting=";
static const int kIsGarbageCollectingParameterLen =
sizeof(kIsGarbageCollectingParameter)-1;
#ifdef XP_WIN
static const char kBreakpadReserveAddressParameter[] = "BreakpadReserveAddress=";
static const int kBreakpadReserveAddressParameterLen =
sizeof(kBreakpadReserveAddressParameter)-1;
static const char kBreakpadReserveSizeParameter[] = "BreakpadReserveSize=";
static const int kBreakpadReserveSizeParameterLen =
sizeof(kBreakpadReserveSizeParameter)-1;
#endif
// this holds additional data sent via the API
static Mutex* crashReporterAPILock;
static Mutex* notesFieldLock;
@ -322,6 +332,17 @@ patched_SetUnhandledExceptionFilter (LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExce
// intercept attempts to change the filter
return nullptr;
}
/**
* Reserve some VM space. In the event that we crash because VM space is
* being leaked without leaking memory, freeing this space before taking
* the minidump will allow us to collect a minidump.
*
* This size is bigger than xul.dll plus some extra for MinidumpWriteDump
* allocations.
*/
static const SIZE_T kReserveSize = 0x2400000; // 36 MB
static void* gBreakpadReservedVM;
#endif
#ifdef XP_MACOSX
@ -540,6 +561,20 @@ bool MinidumpCallback(
WriteFile(hFile, "\n", 1, &nBytes, nullptr);
}
char buffer[128];
int bufferLen;
if (gBreakpadReservedVM) {
WriteFile(hFile, kBreakpadReserveAddressParameter, kBreakpadReserveAddressParameterLen, &nBytes, nullptr);
_ui64toa(uintptr_t(gBreakpadReservedVM), buffer, 10);
WriteFile(hFile, buffer, strlen(buffer), &nBytes, nullptr);
WriteFile(hFile, "\n", 1, &nBytes, nullptr);
WriteFile(hFile, kBreakpadReserveSizeParameter, kBreakpadReserveSizeParameterLen, &nBytes, nullptr);
_ui64toa(kReserveSize, buffer, 10);
WriteFile(hFile, buffer, strlen(buffer), &nBytes, nullptr);
WriteFile(hFile, "\n", 1, &nBytes, nullptr);
}
#ifdef HAS_DLL_BLOCKLIST
DllBlocklist_WriteNotes(hFile);
#endif
@ -548,8 +583,6 @@ bool MinidumpCallback(
MEMORYSTATUSEX statex;
statex.dwLength = sizeof(statex);
if (GlobalMemoryStatusEx(&statex)) {
char buffer[128];
int bufferLen;
#define WRITE_STATEX_FIELD(field, paramName, conversionFunc) \
WriteFile(hFile, k##paramName##Parameter, \
@ -711,18 +744,6 @@ bool MinidumpCallback(
}
#ifdef XP_WIN
static void* gBreakpadReservedVM;
/**
* Reserve some VM space. In the event that we crash because VM space is
* being leaked without leaking memory, freeing this space before taking
* the minidump will allow us to collect a minidump.
*
* This size is bigger than xul.dll plus some extra for MinidumpWriteDump
* allocations.
*/
static const SIZE_T kReserveSize = 0x2400000; // 36 MB
static void
ReserveBreakpadVM()
{