nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1319682 - fix compile warning/error in TaskTracer, r=sinker

Browse source 
MozReview-Commit-ID: 4E0ThIAZAxC

--HG--
extra : rebase_source : d1cb4ae28e7d10b5bdd3d87d6a97413e2d204057
This commit is contained in:
Shih-Chiang Chien 2016-11-24 17:51:23 +08:00
parent ced4cccc2c
commit 1de6877d89
4 changed files with 20 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

20
tools/profiler/tasktracer/GeckoTaskTracer.cpp
View file

@ -16,10 +16,16 @@
#include "nsString.h" #include "nsString.h"
#include "nsThreadUtils.h" #include "nsThreadUtils.h"
#include "platform.h"
#include "prtime.h" #include "prtime.h"
#include <stdarg.h> #include <stdarg.h>
#ifdef XP_WIN
#include <windows.h>
#define getpid GetCurrentProcessId
#endif
#define MAX_SIZE_LOG (1024 * 128) #define MAX_SIZE_LOG (1024 * 128)
// NS_ENSURE_TRUE_VOID() without the warning on the debug build. // NS_ENSURE_TRUE_VOID() without the warning on the debug build.
@ -181,7 +187,11 @@ InitTaskTracer(uint32_t aFlags)
MOZ_ASSERT(!sTraceInfos); MOZ_ASSERT(!sTraceInfos);
sTraceInfoTLS.init(); bool success = sTraceInfoTLS.init();
if (!success) {
MOZ_CRASH();
}
// A memory barrier is necessary here. // A memory barrier is necessary here.
sTraceInfos = new nsTArray<UniquePtr<TraceInfo>>(); sTraceInfos = new nsTArray<UniquePtr<TraceInfo>>();
} }
@ -225,7 +235,7 @@ GetOrCreateTraceInfo()
} }
if (!info) { if (!info) {
info = AllocTraceInfo(gettid()); info = AllocTraceInfo(Thread::GetCurrentId());
sTraceInfoTLS.set(info); sTraceInfoTLS.set(info);
} }
@ -238,7 +248,7 @@ GenNewUniqueTaskId()
TraceInfo* info = GetOrCreateTraceInfo(); TraceInfo* info = GetOrCreateTraceInfo();
ENSURE_TRUE(info, 0); ENSURE_TRUE(info, 0);
pid_t tid = gettid(); Thread::tid_t tid = Thread::GetCurrentId();
uint64_t taskid = ((uint64_t)tid << 32) | ++info->mLastUniqueTaskId; uint64_t taskid = ((uint64_t)tid << 32) | ++info->mLastUniqueTaskId;
return taskid; return taskid;
} }
@ -325,7 +335,7 @@ LogBegin(uint64_t aTaskId, uint64_t aSourceEventId)
log->mBegin.mTaskId = aTaskId; log->mBegin.mTaskId = aTaskId;
log->mBegin.mTime = GetTimestamp(); log->mBegin.mTime = GetTimestamp();
log->mBegin.mPid = getpid(); log->mBegin.mPid = getpid();
log->mBegin.mTid = gettid(); log->mBegin.mTid = Thread::GetCurrentId();
} }
} }
@ -479,7 +489,7 @@ GetLoggedData(TimeStamp aTimeStamp)
return result; return result;
} }
const PRTime PRTime
GetStartTime() GetStartTime()
{ {
return sStartTime; return sStartTime;

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

@ -57,7 +57,7 @@ public:
class AutoSourceEvent : public AutoSaveCurTraceInfo class AutoSourceEvent : public AutoSaveCurTraceInfo
{ {
public: public:
AutoSourceEvent(SourceEventType aType); explicit AutoSourceEvent(SourceEventType aType);
~AutoSourceEvent(); ~AutoSourceEvent();
}; };
@ -73,7 +73,7 @@ void StopLogging();
UniquePtr<nsTArray<nsCString>> GetLoggedData(TimeStamp aStartTime); UniquePtr<nsTArray<nsCString>> GetLoggedData(TimeStamp aStartTime);
// Returns the timestamp when Task Tracer is enabled in this process. // Returns the timestamp when Task Tracer is enabled in this process.
const PRTime GetStartTime(); PRTime GetStartTime();
/** /**
* Internal functions. * Internal functions.

2
tools/profiler/tasktracer/GeckoTaskTracerImpl.h
View file

@ -66,7 +66,7 @@ struct TraceInfoLogNode {
struct TraceInfo struct TraceInfo
{ {
TraceInfo(uint32_t aThreadId) explicit TraceInfo(uint32_t aThreadId)
: mCurTraceSourceId(0) : mCurTraceSourceId(0)
, mCurTaskId(0) , mCurTaskId(0)
, mCurTraceSourceType(Unknown) , mCurTraceSourceType(Unknown)

4
tools/profiler/tasktracer/TracedTaskCommon.h
View file

@ -51,7 +51,7 @@ class TracedRunnable : public TracedTaskCommon
public: public:
NS_DECL_NSIRUNNABLE NS_DECL_NSIRUNNABLE
TracedRunnable(already_AddRefed<nsIRunnable>&& aOriginalObj); explicit TracedRunnable(already_AddRefed<nsIRunnable>&& aOriginalObj);
private: private:
virtual ~TracedRunnable(); virtual ~TracedRunnable();
@ -95,7 +95,7 @@ public:
class AutoRunTask : public AutoSaveCurTraceInfo { class AutoRunTask : public AutoSaveCurTraceInfo {
VirtualTask* mTask; VirtualTask* mTask;
public: public:
AutoRunTask(VirtualTask *aTask); explicit AutoRunTask(VirtualTask *aTask);
~AutoRunTask(); ~AutoRunTask();
}; };
}; };