Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 772630 - Deay JS profiling until we have a JSRuntime. r=ehsan,acrichton

Browse Source
This commit is contained in:
Benoit Girard 2012-07-10 22:05:38 -04:00
parent 67b19a9db9
commit e25a726e82
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/profiler/TableTicker.cpp
View File

@ -891,8 +891,9 @@ void mozilla_sampler_init()
return; return;
} }
const char* features = "js";
mozilla_sampler_start(PROFILE_DEFAULT_ENTRY, PROFILE_DEFAULT_INTERVAL, mozilla_sampler_start(PROFILE_DEFAULT_ENTRY, PROFILE_DEFAULT_INTERVAL,
PROFILE_DEFAULT_FEATURES, PROFILE_DEFAULT_FEATURE_COUNT); &features, 1);
} }
void mozilla_sampler_deinit() void mozilla_sampler_deinit()

22
tools/profiler/sps_sampler.h
View File

@ -234,6 +234,7 @@ public:
: mStackPointer(0) : mStackPointer(0)
, mMarkerPointer(0) , mMarkerPointer(0)
, mQueueClearMarker(false) , mQueueClearMarker(false)
, mStartJSSampling(false)
{ } { }
void addMarker(const char *aMarker) void addMarker(const char *aMarker)
@ -304,16 +305,25 @@ public:
void sampleRuntime(JSRuntime *runtime) { void sampleRuntime(JSRuntime *runtime) {
mRuntime = runtime; mRuntime = runtime;
if (mStartJSSampling)
installJSSampling();
} }
void installJSSampling() { void installJSSampling() {
JS_STATIC_ASSERT(sizeof(mStack[0]) == sizeof(js::ProfileEntry)); JS_STATIC_ASSERT(sizeof(mStack[0]) == sizeof(js::ProfileEntry));
js::SetRuntimeProfilingStack(mRuntime, if (mRuntime) {
(js::ProfileEntry*) mStack, js::SetRuntimeProfilingStack(mRuntime,
(uint32_t*) &mStackPointer, (js::ProfileEntry*) mStack,
mozilla::ArrayLength(mStack)); (uint32_t*) &mStackPointer,
mozilla::ArrayLength(mStack));
mStartJSSampling = false;
} else {
mStartJSSampling = true;
}
} }
void uninstallJSSampling() { void uninstallJSSampling() {
js::SetRuntimeProfilingStack(mRuntime, NULL, NULL, 0); mStartJSSampling = false;
if (mRuntime)
js::SetRuntimeProfilingStack(mRuntime, NULL, NULL, 0);
} }
// Keep a list of active checkpoints // Keep a list of active checkpoints
@ -327,6 +337,8 @@ public:
volatile mozilla::sig_safe_t mQueueClearMarker; volatile mozilla::sig_safe_t mQueueClearMarker;
// The runtime which is being sampled // The runtime which is being sampled
JSRuntime *mRuntime; JSRuntime *mRuntime;
// Start JS Profiling when possible
bool mStartJSSampling;
}; };
inline ProfileStack* mozilla_profile_stack(void) inline ProfileStack* mozilla_profile_stack(void)