зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1339695 (part 7) - Remove ENABLE_LEAF_DATA. r=mstange.
It's defined if any of XP_{WIN,MAC,LINUX} are defined and the latter includes Android as well. So it's defined on all the OSes the profiler supports. --HG-- extra : rebase_source : 1fa9c1fb573a99375b477a048c0b4575ac1eeca0
This commit is contained in:
Родитель
3a889a957c
Коммит
5449b7be2c
|
@ -782,11 +782,9 @@ DoSampleStackTrace(ThreadInfo& aInfo, TickSample* aSample,
|
||||||
NativeStack nativeStack = { nullptr, nullptr, 0, 0 };
|
NativeStack nativeStack = { nullptr, nullptr, 0, 0 };
|
||||||
MergeStacksIntoProfile(aInfo, aSample, nativeStack);
|
MergeStacksIntoProfile(aInfo, aSample, nativeStack);
|
||||||
|
|
||||||
#ifdef ENABLE_LEAF_DATA
|
|
||||||
if (aSample && aAddLeafAddresses) {
|
if (aSample && aAddLeafAddresses) {
|
||||||
aInfo.addTag(ProfileEntry::NativeLeafAddr((void*)aSample->pc));
|
aInfo.addTag(ProfileEntry::NativeLeafAddr((void*)aSample->pc));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This function is called for each sampling period with the current program
|
// This function is called for each sampling period with the current program
|
||||||
|
@ -1869,11 +1867,10 @@ profiler_get_features()
|
||||||
// Walk the C++ stack.
|
// Walk the C++ stack.
|
||||||
"stackwalk",
|
"stackwalk",
|
||||||
#endif
|
#endif
|
||||||
#if defined(ENABLE_LEAF_DATA)
|
|
||||||
// Include the C++ leaf node if not stackwalking. DevTools
|
// Include the C++ leaf node if not stackwalking. DevTools
|
||||||
// profiler doesn't want the native addresses.
|
// profiler doesn't want the native addresses.
|
||||||
"leaf",
|
"leaf",
|
||||||
#endif
|
// Profile Java code (Android only).
|
||||||
"java",
|
"java",
|
||||||
// Tell the JS engine to emit pseudostack entries in the prologue/epilogue.
|
// Tell the JS engine to emit pseudostack entries in the prologue/epilogue.
|
||||||
"js",
|
"js",
|
||||||
|
|
|
@ -77,9 +77,6 @@ static inline pid_t gettid()
|
||||||
bool profiler_verbose();
|
bool profiler_verbose();
|
||||||
|
|
||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
# if defined(__arm__) || defined(__thumb__)
|
|
||||||
# define ENABLE_LEAF_DATA
|
|
||||||
# endif
|
|
||||||
# define LOG(text) \
|
# define LOG(text) \
|
||||||
do { if (profiler_verbose()) \
|
do { if (profiler_verbose()) \
|
||||||
__android_log_write(ANDROID_LOG_ERROR, "Profiler", text); \
|
__android_log_write(ANDROID_LOG_ERROR, "Profiler", text); \
|
||||||
|
@ -101,10 +98,6 @@ bool profiler_verbose();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(XP_MACOSX) || defined(XP_WIN) || defined(XP_LINUX)
|
|
||||||
#define ENABLE_LEAF_DATA
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
|
#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
|
||||||
#define PROFILE_JAVA
|
#define PROFILE_JAVA
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче