Bug 1356752 - Fix --enable-tasktracer build by adding the missing aWriter argument. r?njn
MozReview-Commit-ID: L87KE3BmYRB
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -1135,17 +1135,17 @@ AppendSharedLibraries(JSONWriter& aWrite
info.SortByAddress();
for (size_t i = 0; i < info.GetSize(); i++) {
AddSharedLibraryInfoToStream(aWriter, info.GetEntry(i));
}
}
#ifdef MOZ_TASK_TRACER
static void
-StreamNameAndThreadId(const char* aName, int aThreadId)
+StreamNameAndThreadId(JSONWriter& aWriter, const char* aName, int aThreadId)
{
aWriter.StartObjectElement();
{
if (XRE_GetProcessType() == GeckoProcessType_Plugin) {
// TODO Add the proper plugin name
aWriter.StringProperty("name", "Plugin");
} else {
aWriter.StringProperty("name", aName);
@@ -1170,23 +1170,23 @@ StreamTaskTracer(PS::LockRef aLock, Spli
}
aWriter.EndArray();
aWriter.StartArrayProperty("threads");
{
const PS::ThreadVector& liveThreads = gPS->LiveThreads(aLock);
for (size_t i = 0; i < liveThreads.size(); i++) {
ThreadInfo* info = liveThreads.at(i);
- StreamNameAndThreadId(info->Name(), info->ThreadId());
+ StreamNameAndThreadId(aWriter, info->Name(), info->ThreadId());
}
const PS::ThreadVector& deadThreads = gPS->DeadThreads(aLock);
for (size_t i = 0; i < deadThreads.size(); i++) {
ThreadInfo* info = deadThreads.at(i);
- StreamNameAndThreadId(info->Name(), info->ThreadId());
+ StreamNameAndThreadId(aWriter, info->Name(), info->ThreadId());
}
}
aWriter.EndArray();
aWriter.DoubleProperty(
"start", static_cast<double>(mozilla::tasktracer::GetStartTime()));
#endif
}