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 1193038: Purposely leak StatisticsReport object and suppress the leak report r=glandium,mccr8,njn

Browse Source
This commit is contained in:
Georg Fritzsche 2015-08-18 19:21:40 +02:00
parent e5b74baf58
commit a08f4cd648
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/valgrind/cross-architecture.sup
View File

@ -34,6 +34,15 @@
fun:_ZN13CrashReporter14SetupExtraDataEP7nsIFileRK19nsACString_internal
...
}
{
We purposely leak the StatisticsReporter object
Memcheck:Leak
fun:malloc
fun:moz_xmalloc
fun:operator new
fun:_Z21XRE_CreateStatsObjectv
...
}
####################################
# Leaks in third party libraries #

22
toolkit/xre/nsAppRunner.cpp
View File

@ -21,6 +21,7 @@
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
#include "mozilla/Telemetry.h"
#include "mozilla/MemoryChecking.h"
#include "nsAppRunner.h"
#include "mozilla/AppData.h"
@ -3072,7 +3073,6 @@ public:
~XREMain() {
mScopedXPCOM = nullptr;
mStatisticsRecorder = nullptr;
mAppData = nullptr;
}
@ -3091,7 +3091,6 @@ public:
#endif
UniquePtr<ScopedXPCOMStartup> mScopedXPCOM;
UniquePtr<base::StatisticsRecorder> mStatisticsRecorder;
nsAutoPtr<mozilla::ScopedAppData> mAppData;
nsXREDirProvider mDirProvider;
@ -4345,10 +4344,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
NS_ENSURE_TRUE(aAppData, 2);
// A initializer to initialize histogram collection, a chromium
// thing used by Telemetry.
mStatisticsRecorder = MakeUnique<base::StatisticsRecorder>();
mAppData = new ScopedAppData(aAppData);
if (!mAppData)
return 1;
@ -4413,7 +4408,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
}
mScopedXPCOM = nullptr;
mStatisticsRecorder = nullptr;
// unlock the profile after ScopedXPCOMStartup object (xpcom)
// has gone out of scope. see bug #386739 for more details
@ -4471,10 +4465,24 @@ XRE_StopLateWriteChecks(void) {
mozilla::StopLateWriteChecks();
}
// Separate stub function to let us specifically suppress it in Valgrind
void
XRE_CreateStatsObject()
{
// A initializer to initialize histogram collection, a chromium
// thing used by Telemetry (and effectively a global; it's all static).
// Note: purposely leaked
base::StatisticsRecorder* statistics_recorder = new base::StatisticsRecorder();
MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(statistics_recorder);
unused << statistics_recorder;
}
int
XRE_main(int argc, char* argv[], const nsXREAppData* aAppData, uint32_t aFlags)
{
XREMain main;
XRE_CreateStatsObject();
int result = main.XRE_main(argc, argv, aAppData);
mozilla::RecordShutdownEndTimeStamp();
return result;