mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 14:55:47 +00:00
8a68e6fb83
Currently the Gecko Profiler defines a moderate amount of stuff when MOZ_GECKO_PROFILER is undefined. It also #includes various headers, including JS ones. This is making it difficult to separate Gecko's media stack for inclusion in Servo. This patch greatly simplifies how things are exposed. The starting point is: - GeckoProfiler.h can be #included unconditionally; - everything else from the profiler must be guarded by MOZ_GECKO_PROFILER. In practice this introduces way too many #ifdefs, so the patch loosens it by adding no-op macros for a number of the most common operations. The net result is that #ifdefs and macros are used a bit more, but almost nothing is exposed in non-MOZ_GECKO_PROFILER builds (including ProfilerMarkerPayload.h and GeckoProfiler.h), and understanding what is exposed is much simpler than before. Note also that in BHR, ThreadStackHelper is now entirely absent in non-MOZ_GECKO_PROFILER builds.
88 lines
2.5 KiB
C++
88 lines
2.5 KiB
C++
/* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "ANRReporter.h"
|
|
#include "GeckoProfiler.h"
|
|
|
|
#include <unistd.h>
|
|
|
|
namespace mozilla {
|
|
|
|
bool
|
|
ANRReporter::RequestNativeStack(bool aUnwind)
|
|
{
|
|
#ifdef MOZ_GECKO_PROFILER
|
|
if (profiler_is_active()) {
|
|
// Don't proceed if profiler is already running
|
|
return false;
|
|
}
|
|
|
|
// WARNING: we are on the ANR reporter thread at this point and it is
|
|
// generally unsafe to use the profiler from off the main thread. However,
|
|
// the risk here is limited because for most users, the profiler is not run
|
|
// elsewhere. See the discussion in Bug 863777, comment 13
|
|
uint32_t features = ProfilerFeature::Leaf |
|
|
ProfilerFeature::Privacy |
|
|
(aUnwind ? ProfilerFeature::StackWalk : 0) |
|
|
ProfilerFeature::Threads;
|
|
|
|
const char *NATIVE_STACK_THREADS[] = {"GeckoMain", "Compositor"};
|
|
|
|
// Buffer one sample and let the profiler wait a long time
|
|
profiler_start(/* entries */ 100, /* interval */ 10000, features,
|
|
NATIVE_STACK_THREADS,
|
|
sizeof(NATIVE_STACK_THREADS) / sizeof(char*));
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
jni::String::LocalRef
|
|
ANRReporter::GetNativeStack()
|
|
{
|
|
#ifdef MOZ_GECKO_PROFILER
|
|
// Timeout if we don't get a profiler sample after 5 seconds.
|
|
const PRIntervalTime timeout = PR_SecondsToInterval(5);
|
|
const PRIntervalTime startTime = PR_IntervalNow();
|
|
|
|
// Pointer to a profile JSON string
|
|
typedef mozilla::UniquePtr<char[]> ProfilePtr;
|
|
|
|
// profiler_get_profile() will return nullptr if the profiler is inactive.
|
|
ProfilePtr profile(profiler_get_profile());
|
|
if (!profile) {
|
|
return nullptr;
|
|
}
|
|
|
|
while (profile && !strstr(profile.get(), "\"samples\":[{")) {
|
|
// no sample yet?
|
|
if (PR_IntervalNow() - startTime >= timeout) {
|
|
return nullptr;
|
|
}
|
|
usleep(100000ul); // Sleep for 100ms
|
|
profile = ProfilePtr(profiler_get_profile());
|
|
}
|
|
|
|
if (profile) {
|
|
return jni::String::Param(profile.get());
|
|
}
|
|
#endif
|
|
return nullptr;
|
|
}
|
|
|
|
void
|
|
ANRReporter::ReleaseNativeStack()
|
|
{
|
|
#ifdef MOZ_GECKO_PROFILER
|
|
if (!profiler_is_active()) {
|
|
// Maybe profiler support is disabled?
|
|
return;
|
|
}
|
|
profiler_stop();
|
|
#endif
|
|
}
|
|
|
|
} // namespace
|
|
|