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 1061024 (part 1) - Don't run DMD when about:memory's "Measure" button is pressed. r=jld.

Browse Source 
--HG--
extra : rebase_source : ddf0236352c64eb9839dfd0a219451a568aba10e
This commit is contained in:
Nicholas Nethercote 2014-08-31 20:36:26 -07:00
parent 2f2c34f333
commit 1e51d01858
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/ipc/ContentParent.cpp
View File

@ -2641,16 +2641,18 @@ ContentParent::Observe(nsISupports* aSubject,
MOZ_ASSERT(cmsg[identOffset - 1] == '='); MOZ_ASSERT(cmsg[identOffset - 1] == '=');
FileDescriptor dmdFileDesc; FileDescriptor dmdFileDesc;
#ifdef MOZ_DMD #ifdef MOZ_DMD
FILE *dmdFile;
nsAutoString dmdIdent(Substring(msg, identOffset)); nsAutoString dmdIdent(Substring(msg, identOffset));
nsresult rv = nsMemoryInfoDumper::OpenDMDFile(dmdIdent, Pid(), &dmdFile); if (!dmdIdent.IsEmpty()) {
if (NS_WARN_IF(NS_FAILED(rv))) { FILE *dmdFile = nullptr;
// Proceed with the memory report as if DMD were disabled. nsresult rv = nsMemoryInfoDumper::OpenDMDFile(dmdIdent, Pid(), &dmdFile);
dmdFile = nullptr; if (NS_WARN_IF(NS_FAILED(rv))) {
} // Proceed with the memory report as if DMD were disabled.
if (dmdFile) { dmdFile = nullptr;
dmdFileDesc = FILEToFileDescriptor(dmdFile); }
fclose(dmdFile); if (dmdFile) {
dmdFileDesc = FILEToFileDescriptor(dmdFile);
fclose(dmdFile);
}
} }
#endif #endif
unused << SendPMemoryReportRequestConstructor( unused << SendPMemoryReportRequestConstructor(

12
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -1189,11 +1189,13 @@ nsMemoryReporterManager::StartGettingReports()
// Get reports for this process. // Get reports for this process.
FILE* parentDMDFile = nullptr; FILE* parentDMDFile = nullptr;
#ifdef MOZ_DMD #ifdef MOZ_DMD
nsresult rv = nsMemoryInfoDumper::OpenDMDFile(s->mDMDDumpIdent, getpid(), if (!s->mDMDDumpIdent.IsEmpty()) {
&parentDMDFile); nsresult rv = nsMemoryInfoDumper::OpenDMDFile(s->mDMDDumpIdent, getpid(),
if (NS_WARN_IF(NS_FAILED(rv))) { &parentDMDFile);
// Proceed with the memory report as if DMD were disabled. if (NS_WARN_IF(NS_FAILED(rv))) {
parentDMDFile = nullptr; // Proceed with the memory report as if DMD were disabled.
parentDMDFile = nullptr;
}
} }
#endif #endif
GetReportsForThisProcessExtended(s->mHandleReport, s->mHandleReportData, GetReportsForThisProcessExtended(s->mHandleReport, s->mHandleReportData,