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 1548371 - Fix --enable-task-tracer build. r=gerald

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Markus Stange 2019-05-02 11:09:11 +00:00
parent ac739078cc
commit 69c87a12c5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/profiler/tasktracer/GeckoTaskTracer.cpp
View File

@ -390,8 +390,8 @@ void StartLogging() {
void StopLogging() { SetLogStarted(false); }
UniquePtr<nsTArray<nsCString>> GetLoggedData(TimeStamp aTimeStamp) {
auto result = MakeUnique<nsTArray<nsCString>>();
UniquePtr<Vector<nsCString>> GetLoggedData(TimeStamp aTimeStamp) {
auto result = MakeUnique<Vector<nsCString>>();
// TODO: This is called from a signal handler. Use semaphore instead.
StaticMutexAutoLock lock(sMutex);
@ -410,7 +410,8 @@ UniquePtr<nsTArray<nsCString>> GetLoggedData(TimeStamp aTimeStamp) {
nsTArray<nsCString>& strs = info->mStrs;
for (TraceInfoLogNode* node = info->mLogsHead; node; node = node->mNext) {
TraceInfoLogType& log = node->mLog;
nsCString& buffer = *result->AppendElement();
MOZ_RELEASE_ASSERT(result->append(nsCString()));
nsCString& buffer = result->back();
switch (log.mType) {
case ACTION_DISPATCH:

4
tools/profiler/tasktracer/GeckoTaskTracer.h
View File

@ -10,9 +10,9 @@
#include "mozilla/Atomics.h"
#include "mozilla/Maybe.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/Vector.h"
#include "nsCOMPtr.h"
#include "nsStringFwd.h"
#include "nsTArrayForwardDeclare.h"
#include <stdarg.h>
@ -132,7 +132,7 @@ inline void AddLabel(const char* aFormat, ...) {
void StartLogging();
void StopLogging();
UniquePtr<nsTArray<nsCString>> GetLoggedData(TimeStamp aStartTime);
UniquePtr<Vector<nsCString>> GetLoggedData(TimeStamp aStartTime);
// Returns the timestamp when Task Tracer is enabled in this process.
PRTime GetStartTime();